From 662e207bd32adb5fcb6836513683ee1503eec17a Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 26 Sep 2025 20:04:37 +0800 Subject: [PATCH] 321 --- .../Business/OdfPortsController.cs | 60 +++++++++++++----- .../wwwroot/ImportTemplate/OdfPorts.xlsx | Bin 10931 -> 10949 bytes ZR.Model/Business/Dto/OdfPortsDto.cs | 6 +- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs index 3ec5d24..2e9c2c7 100644 --- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs +++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs @@ -1,20 +1,27 @@ -using Microsoft.AspNetCore.Mvc; -using ZR.Model.Business.Dto; -using ZR.Model.Business; -using ZR.Service.Business.IBusinessService; -using MiniExcelLibs; -using ZR.Service.Business; -using System.Collections.Generic; -using SqlSugar; -using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaBusinessGetLiveInfoResponse.Types; -using System.Threading.Tasks; -using ZR.Repository; using Aliyun.OSS; -using System.Linq; -using ZR.Model.System.Dto; + using Microsoft.AspNetCore.Connections.Features; -using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Mvc; +using Microsoft.IdentityModel.Tokens; + +using MiniExcelLibs; + +using SqlSugar; + +using System.Collections.Generic; +using System.Linq; using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +using ZR.Model.Business; +using ZR.Model.Business.Dto; +using ZR.Model.System.Dto; +using ZR.Repository; +using ZR.Service.Business; +using ZR.Service.Business.IBusinessService; + +using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaBusinessGetLiveInfoResponse.Types; //创建时间：2025-08-05 namespace ZR.Admin.WebApi.Controllers.Business @@ -380,11 +387,9 @@ namespace ZR.Admin.WebApi.Controllers.Business port.OpticalAttenuation = parm.OpticalAttenuation; port.UpdatedAt = DateTime.Now; port.OpticalCableOffRemarks = parm.OpticalCableOffRemarks; - if (port.Status == 0) { port.Remarks = ""; - port.OpticalCableOffRemarks = ""; } else { @@ -644,7 +649,28 @@ 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()}"; + string remarks = ""; + if (!string.IsNullOrEmpty(excelItem.Remarks)) + { + remarks = excelItem.Remarks; + if (string.IsNullOrEmpty(excelItem.BusinessType)) + { + var t = remarks.Split(" "); + if (t.Length > 2) + { + excelItem.BusinessType = t[2]; + } + } + else + { + excelItem.BusinessType = remarks.Substring(0, 1); + } + } + else + { + remarks = $"{excelItem.YeWuMingCheng?.Trim()} {excelItem.EquipmentModel?.Trim()} {excelItem.BusinessType?.Trim()} {(!string.IsNullOrEmpty(excelItem.one) ? excelItem?.one + "/" : "")}{(!string.IsNullOrEmpty(excelItem.two?.Trim()) ? excelItem.two?.Trim() + "/" : "")}{excelItem.three?.Trim()}"; + remarks = remarks.Trim(); + } if (port == null) { port = new OdfPorts() diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx index a3baaaa53cef2d0d7f1ffe92426e86dd68d46ba4..ff628dac49a5ba3b1668f2c89d19a28e968333e9 100644 GIT binary patch delta 2884 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 delta 2896 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 diff --git a/ZR.Model/Business/Dto/OdfPortsDto.cs b/ZR.Model/Business/Dto/OdfPortsDto.cs index 1769b71..5e3c7fd 100644 --- a/ZR.Model/Business/Dto/OdfPortsDto.cs +++ b/ZR.Model/Business/Dto/OdfPortsDto.cs @@ -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）")]