From b46027e9b09800c1144edfe7aba3d130c513daa6 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Thu, 7 Aug 2025 16:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Business/OdfFramesController.cs           |  20 +-
 .../Business/OdfPortsController.cs            | 147 ++++++++++++-
 .../Business/OdfRacksController.cs            |  21 +-
 .../Business/OdfRoomsController.cs            | 203 +++++++++++++++++-
 .../wwwroot/ImportTemplate/OdfPorts.xlsx      | Bin 0 -> 10667 bytes
 .../wwwroot/ImportTemplate/OdfRooms.xlsx      | Bin 4375 -> 10387 bytes
 ZR.Model/Business/Dto/OdfPortsDto.cs          |  63 ++++++
 ZR.Model/Business/Dto/OdfRoomsDto.cs          |  34 +++
 8 files changed, 470 insertions(+), 18 deletions(-)
 create mode 100644 ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx

diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfFramesController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfFramesController.cs
index 96804c9..85cf7c5 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfFramesController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfFramesController.cs
@@ -152,11 +152,29 @@ namespace ZR.Admin.WebApi.Controllers.Business
         [HttpPut]
         [ActionPermissionFilter(Permission = "odfframes:edit")]
         [Log(Title = "框-信息", BusinessType = BusinessType.UPDATE)]
-        public IActionResult UpdateOdfFrames([FromBody] OdfFramesDto parm)
+        public async Task<IActionResult> UpdateOdfFrames([FromBody] OdfFramesDto parm)
         {
             var modal = parm.Adapt<OdfFrames>().ToUpdate(HttpContext);
+            var oldModel = _OdfFramesService.GetById(parm.Id);
             var response = _OdfFramesService.UpdateOdfFrames(modal);
+            if (response > 0)
+            {
+                var rortsName = oldModel.PortsName;
+                var frameId = modal.Id;
+                var rackId = modal.RackId;
 
+                if (oldModel.PortsName != modal.PortsName)
+                {
+                    // 最直接的转换
+                    await _OdfPortsService.UpdateAsync(
+                        it => it.FrameId == frameId && it.RackId == rackId,  // WHERE条件
+                        it => new OdfPorts               // SET部分
+                        {
+                            FrameName = modal.PortsName,
+                        }
+                    );
+                }
+            }
             return ToResponse(response);
         }
 
diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
index 1211ee5..12401cc 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
@@ -10,6 +10,7 @@ using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaBusinessGetLiveInfoRespon
 using System.Threading.Tasks;
 using ZR.Repository;
 using Aliyun.OSS;
+using System.Linq;
 
 //创建时间：2025-08-05
 namespace ZR.Admin.WebApi.Controllers.Business
@@ -30,12 +31,16 @@ namespace ZR.Admin.WebApi.Controllers.Business
         private readonly IOdfRoomsService _OdfRoomsService;
 
 
+        private readonly ISysDeptService _SysDeptService;
+
 
         /// <summary>
         ///  
         /// </summary>
         private readonly ISysUserService _SysUserService;
 
+
+
         /// <summary>
         ///机架
         /// </summary>
@@ -51,13 +56,17 @@ namespace ZR.Admin.WebApi.Controllers.Business
                    ISysUserService sysUserService,
                    IOdfPortsService odfPortsService,
                    IOdfFramesService odfFramesService,
-                   IOdfRacksService odfRacksService)
+                   IOdfRacksService odfRacksService
+
+                   )
         {
             _OdfRoomsService = OdfRoomsService;
             _SysUserService = sysUserService;
             _OdfPortsService = odfPortsService;
             _OdfFramesService = odfFramesService;
             _OdfRacksService = odfRacksService;
+            _SysDeptService = sysDeptService;
+
         }
 
         /// <summary>
@@ -339,15 +348,143 @@ namespace ZR.Admin.WebApi.Controllers.Business
         [HttpPost("importData")]
         [Log(Title = "端口导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false)]
         [ActionPermissionFilter(Permission = "odfports:import")]
-        public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
+        public async Task<IActionResult> ImportData([FromForm(Name = "file")] IFormFile formFile)
         {
-            List<OdfPortsDto> list = new();
+            List<OdfPortsImportDto> list = new();
             using (var stream = formFile.OpenReadStream())
             {
-                list = stream.Query<OdfPortsDto>(startCell: "A1").ToList();
+                list = stream.Query<OdfPortsImportDto>(startCell: "A1").ToList();
             }
+            int errorCount = 0;
+            int successCount = 0;
+            int addRoomCount = 0;
+            int addRackCount = 0;
+            int addFrameCount = 0;
+            int addPortCount = 0;
+            if (list.Count > 0)
+            {
+                List<OdfPorts> odfPorts = new List<OdfPorts>();
+                var deptName = list.Select(it => it.DeptName.Trim()).Distinct().ToList();
+                var deptInfo = _SysDeptService.AsQueryable().Where(it => deptName.Contains(it.DeptName)).Select(it => new { it.DeptId, it.DeptName }).ToList();
 
-            return SUCCESS(_OdfPortsService.ImportOdfPorts(list.Adapt<List<OdfPorts>>()));
+                var roomNameList = list.Select(it => it.RoomName).Select(it => it.Trim()).Distinct().ToList();
+                var roomList = _OdfRoomsService.AsQueryable().Where(it => roomNameList.Contains(it.RoomName)).ToList();
+                foreach (var excelItem in list)
+                {
+                    try
+                    {
+                        var dept = deptInfo.Find(it => it.DeptName == excelItem.DeptName);
+                        if (dept == null)
+                        {
+                            //没有部门，下一个数据
+                            errorCount++;
+                            continue;
+                        }
+                        var room = roomList.Find(it => it.RoomName == excelItem.RoomName);
+                        if (room == null)
+                        {
+                            //添加机房
+                            var roomItem = new OdfRooms()
+                            {
+                                CreatedAt = DateTime.Now,
+                                RoomAddress = "",
+                                UpdatedAt = DateTime.Now,
+                                DeptId = dept.DeptId,
+                                DeptName = dept.DeptName,
+                                RacksCount = 0,
+                                Remarks = "",
+                                RoomName = excelItem.RoomName
+                            };
+                            await _OdfRoomsService.InsertReturnEntityAsync(roomItem);
+                            addRoomCount++;
+                            roomList.Add(roomItem);
+                            room = roomItem;
+                        }
+                        //添加机架
+                        var rack = _OdfRacksService.AsQueryable().Where(it => it.RoomId == room.Id && it.RackName == excelItem.RackName).First();
+                        if (rack == null)
+                        {
+                            var sequenceNumber = _OdfRacksService.AsQueryable().Where(it => it.RoomId == room.Id).Max(it => (int?)it.SequenceNumber) ?? 0;
+                            sequenceNumber++;
+                            rack = new OdfRacks()
+                            {
+                                CreatedAt = DateTime.Now,
+                                UpdatedAt = DateTime.Now,
+                                RoomId = room.Id,
+                                RackName = excelItem.RackName,
+                                DeptId = dept.DeptId,
+                                FrameCount = 0,
+                                SequenceNumber = sequenceNumber,
+                            };
+                            await _OdfRacksService.InsertReturnEntityAsync(rack);
+                            addRackCount++;
+                        }
+                        //添加框
+                        var frame = _OdfFramesService.AsQueryable().Where(it => it.RackId == rack.Id && it.PortsName == excelItem.FrameName).First();
+                        if (frame == null)
+                        {
+                            var sequenceNumber = _OdfFramesService.AsQueryable().Where(it => it.RackId == rack.Id).Max(it => (int?)it.SequenceNumber) ?? 0;
+                            sequenceNumber++;
+                            frame = new OdfFrames()
+                            {
+                                CreatedAt = DateTime.Now,
+                                UpdateAt = DateTime.Now,
+                                RackId = rack.Id,
+                                PortsName = excelItem.FrameName,
+                                SequenceNumber = sequenceNumber,
+                                PortsCol = 0,
+                                PortsCount = 0,
+                                DeptId = dept.DeptId,
+                                PortsRow = 0,
+                            };
+                            await _OdfFramesService.InsertReturnEntityAsync(frame);
+                            addFrameCount++;
+                        }
+                        //添加端口
+                        var port = _OdfPortsService.AsQueryable().Where(it => it.FrameId == frame.Id && it.RowNumber == excelItem.RowNumber && it.PortNumber == excelItem.PortNumber).First();
+                        if (port == null)
+                        {
+                            port = new OdfPorts()
+                            {
+                                CreatedAt = DateTime.Now,
+                                UpdatedAt = DateTime.Now,
+                                DeptId = dept.DeptId,
+                                DeptName = dept.DeptName,
+                                FrameId = frame.Id,
+                                FrameName = frame.PortsName,
+                                RackId = rack.Id,
+                                RackName = rack.RackName,
+                                RoomId = room.Id,
+                                RoomName = room.RoomName,
+                                Name = excelItem.RowNumber + "-" + excelItem.PortNumber,
+                                RowNumber = excelItem.RowNumber,
+                                PortNumber = excelItem.PortNumber,
+                                Status = excelItem.Status,
+                                Remarks = excelItem.Remarks?.Trim(),
+                                OpticalAttenuation = excelItem.OpticalAttenuation?.Trim(),
+                                HistoryRemarks = excelItem.HistoryRemarks?.Trim(),
+                            };
+                            await _OdfPortsService.InsertAsync(port);
+                            addPortCount++;
+                        }
+                        else
+                        {
+                            port.HistoryRemarks = excelItem.HistoryRemarks?.Trim();
+                            port.Remarks = excelItem.Remarks?.Trim();
+                            port.OpticalAttenuation = excelItem.OpticalAttenuation?.Trim();
+                            port.Status = excelItem.Status;
+                            await _OdfPortsService.UpdateAsync(port);
+                        }
+                        successCount++;
+                    }
+                    catch (Exception)
+                    {
+                        errorCount++;
+                    }
+                }
+
+            }
+            return SUCCESS($"共查询{list.Count}条数据，导入成功{successCount}条数据！导入失败{errorCount}条！{(addRoomCount > 0 ? "添加机房" + addRoomCount + "条," : "")}{(addRackCount > 0 ? "添加机架" + addRackCount + "条" : "")}{(addFrameCount > 0 ? "添加机框" + addFrameCount + "条" : "")}");
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs
index 1276ccb..d8f9f28 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfRacksController.cs
@@ -4,6 +4,7 @@ using ZR.Model.Business;
 using ZR.Service.Business.IBusinessService;
 using MiniExcelLibs;
 using ZR.Service.Business;
+using SqlSugar;
 
 //创建时间：2025-08-05
 namespace ZR.Admin.WebApi.Controllers.Business
@@ -207,11 +208,29 @@ namespace ZR.Admin.WebApi.Controllers.Business
         [HttpPut]
         [ActionPermissionFilter(Permission = "odfracks:edit")]
         [Log(Title = "机架列表", BusinessType = BusinessType.UPDATE)]
-        public IActionResult UpdateOdfRacks([FromBody] OdfRacksDto parm)
+        public async Task<IActionResult> UpdateOdfRacks([FromBody] OdfRacksDto parm)
         {
             var modal = parm.Adapt<OdfRacks>().ToUpdate(HttpContext);
+            var oldModel = _OdfRacksService.GetById(parm.Id);
             var response = _OdfRacksService.UpdateOdfRacks(modal);
+            if (response > 0)
+            {
+                var rackName = oldModel.RackName;
+                var oldRoomId = modal.RoomId;
+                var rackId = modal.Id;
 
+                if (oldModel.RackName != modal.RackName)
+                {
+                    // 最直接的转换
+                    await _OdfPortsService.UpdateAsync(
+                        it => it.RoomId == oldRoomId && it.RackId == rackId,  // WHERE条件
+                        it => new OdfPorts               // SET部分
+                        {
+                            RackName = modal.RackName,
+                        }
+                    );
+                }
+            }
             return ToResponse(response);
         }
 
diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs
index 5edb8fc..995c1ae 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs
@@ -7,6 +7,9 @@ using ZR.ServiceCore.Services;
 using System.Threading.Tasks;
 using ZR.Service.Business;
 using SqlSugar;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaBusinessGetLiveInfoResponse.Types;
+using Aliyun.OSS;
+using Azure;
 
 //创建时间：2025-08-05
 namespace ZR.Admin.WebApi.Controllers.Business
@@ -342,7 +345,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                         }
                     }
                 }
-            
+
             }
 
 
@@ -378,14 +381,17 @@ namespace ZR.Admin.WebApi.Controllers.Business
             var response = _OdfRoomsService.UpdateOdfRooms(modal);
             if (response > 0)
             {
+                var deptId = modal.DeptId ?? 0;
+                var deptName = modal.DeptName;
+                var roomName = modal.RoomName;
+                var oldRoomId = oldModel.Id;
+
                 if (oldModel.DeptId != modal.DeptId)
                 {
-                    var deptId = modal.DeptId ?? 0;
-                    var deptName = modal.DeptName;
-                    var roomId = oldModel.Id;
+
                     // 最直接的转换
                     await _OdfPortsService.UpdateAsync(
-                        it => it.RoomId == roomId,  // WHERE条件
+                        it => it.RoomId == oldRoomId,  // WHERE条件
                         it => new OdfPorts               // SET部分
                         {
                             DeptId = deptId,
@@ -394,14 +400,14 @@ namespace ZR.Admin.WebApi.Controllers.Business
                     );
                     // 1. 更新 odf_racks
                     var racksUpdated = await _OdfRacksService.UpdateAsync(
-                        r => r.RoomId == roomId,
+                        r => r.RoomId == oldRoomId,
                         r => new OdfRacks { DeptId = deptId }
                     );
 
                     // 2. 更新 odf_frames（方法1：子查询）
                     var framesUpdated = await _OdfFramesService.UpdateAsync(
                         f => SqlFunc.Subqueryable<OdfRacks>()
-                             .Where(r => r.RoomId == roomId && r.Id == f.RackId)
+                             .Where(r => r.RoomId == oldRoomId && r.Id == f.RackId)
                              .Any(),
                         f => new OdfFrames { DeptId = deptId }
                     );
@@ -410,6 +416,17 @@ namespace ZR.Admin.WebApi.Controllers.Business
                     //_OdfFramesService
                     //_OdfRacksService
                 }
+                if (oldModel.RoomName != modal.RoomName)
+                {
+                    // 最直接的转换
+                    await _OdfPortsService.UpdateAsync(
+                        it => it.RoomId == oldRoomId,  // WHERE条件
+                        it => new OdfPorts               // SET部分
+                        {
+                            RoomName = roomName,
+                        }
+                    );
+                }
             }
             return ToResponse(response);
         }
@@ -454,15 +471,179 @@ namespace ZR.Admin.WebApi.Controllers.Business
         [HttpPost("importData")]
         [Log(Title = "机房列表导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false)]
         [ActionPermissionFilter(Permission = "odfrooms:import")]
-        public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
+        public async Task<IActionResult> ImportData([FromForm(Name = "file")] IFormFile formFile)
         {
-            List<OdfRoomsDto> list = new();
+            List<OdfRoomsImDto> list = new();
             using (var stream = formFile.OpenReadStream())
             {
-                list = stream.Query<OdfRoomsDto>(startCell: "A1").ToList();
+                list = stream.Query<OdfRoomsImDto>(startCell: "A1").ToList();
             }
+            int errorCount = 0;
+            int successCount = 0;
+            int addRoomCount = 0;
+            int addRackCount = 0;
+            int addFrameCount = 0;
+            int addPortCount = 0;
+            if (list.Count > 0)
+            {
+                List<OdfPorts> odfPorts = new List<OdfPorts>();
+                var deptName = list.Select(it => it.DeptName.Trim()).Distinct().ToList();
+                var deptInfo = sysDeptService.AsQueryable().Where(it => deptName.Contains(it.DeptName)).Select(it => new { it.DeptId, it.DeptName }).ToList();
 
-            return SUCCESS(_OdfRoomsService.ImportOdfRooms(list.Adapt<List<OdfRooms>>()));
+                var roomNameList = list.Select(it => it.RoomName).Select(it => it.Trim()).Distinct().ToList();
+                var roomList = _OdfRoomsService.AsQueryable().Where(it => roomNameList.Contains(it.RoomName)).ToList();
+                foreach (var excelItem in list)
+                {
+                    try
+                    {
+                        var dept = deptInfo.Find(it => it.DeptName == excelItem.DeptName);
+                        if (dept == null)
+                        {
+                            //没有部门，下一个数据
+                            errorCount++;
+                            continue;
+                        }
+                        var room = roomList.Find(it => it.RoomName == excelItem.RoomName);
+                        if (room == null)
+                        {
+                            //添加机房
+                            var roomItem = new OdfRooms()
+                            {
+                                CreatedAt = DateTime.Now,
+                                RoomAddress = "",
+                                UpdatedAt = DateTime.Now,
+                                DeptId = dept.DeptId,
+                                DeptName = dept.DeptName,
+                                RacksCount = excelItem.RacksCount,
+                                Remarks = "",
+                                RoomName = excelItem.RoomName
+                            };
+                            await _OdfRoomsService.InsertReturnEntityAsync(roomItem);
+                            addRoomCount++;
+                            roomList.Add(roomItem);
+                            room = roomItem;
+                        }
+                        else
+                        {
+                            room.RoomAddress = excelItem.RoomAddress?.Trim();
+                            room.Remarks = excelItem.Remarks?.Trim();
+                            room.RacksCount = excelItem.RacksCount ?? 0;
+                            room.UpdatedAt = DateTime.Now;
+                            await _OdfRoomsService.UpdateAsync(room);
+                            continue;
+                        }
+                        if (excelItem.RacksCount > 0)
+                        {
+                            var roomId = room.Id;
+                            var roomName = room.RoomName;
+                            List<OdfRacks> racksList = new List<OdfRacks>();
+                            //添加机架
+                            for (int i = 0; i < excelItem.RacksCount; i++)
+                            {
+                                var t = await _OdfRacksService.InsertReturnEntityAsync(new OdfRacks
+                                {
+                                    CreatedAt = DateTime.Now,
+                                    FrameCount = excelItem.FrameCount,
+                                    DeptId = room.DeptId ?? 0,
+                                    RackName = $"odf-{(i + 1)}",
+                                    RoomId = roomId,
+                                    SequenceNumber = i + 1,
+                                    UpdatedAt = DateTime.Now,
+                                }); // 直接插入机架
+                                racksList.Add(t);
+
+                            }
+
+                            //机架添加完成
+                            //return Insertable(model).ExecuteReturnEntity();
+                            if (excelItem.FrameCount > 0)
+                            {
+
+                                //添加机框
+                                List<OdfFrames> framesList = new List<OdfFrames>();
+
+                                foreach (var rack in racksList)
+                                {
+                                    for (int i = 0; i < excelItem.FrameCount; i++)
+                                    {
+                                        var t = await _OdfFramesService.InsertReturnEntityAsync(new OdfFrames()
+                                        {
+                                            CreatedAt = DateTime.Now,
+                                            UpdateAt = DateTime.Now,
+                                            PortsCol = 12,
+                                            PortsRow = 6,
+                                            PortsCount = 6 * 12,
+                                            DeptId = rack.DeptId,
+                                            PortsName = $"{(i + 1)}框",
+                                            RackId = rack.Id,
+                                            SequenceNumber = i + 1
+                                        });
+                                        framesList.Add(t);
+                                    }
+                                }
+                                int index = 0;
+                                //添加端口
+                                foreach (var frame in framesList)
+                                {
+                                    var ra = racksList.Find(it => it.Id == frame.RackId);
+                                    if (ra == null)
+                                    {
+                                        continue;
+                                    }
+                                    List<OdfPorts> ports = new List<OdfPorts>();
+                                    for (int row = 0; row < 6; row++)
+                                    {
+                                        for (int port = 0; port < 12; port++)
+                                        {
+                                            ports.Add(new OdfPorts()
+                                            {
+                                                CreatedAt = DateTime.Now,
+                                                DeptId = frame.DeptId ?? 0,
+                                                DeptName = room.DeptName,
+                                                RackId = frame.RackId,
+                                                RackName = ra.RackName,
+                                                RoomId = roomId,
+                                                RoomName = roomName,
+                                                FrameId = frame.Id,
+                                                FrameName = frame.PortsName,
+                                                Name = $"{(row + 1)}-{(port + 1)}",
+                                                RowNumber = row,
+                                                PortNumber = port,
+                                                OpticalAttenuation = "",
+                                                HistoryRemarks = "",
+                                                Remarks = "",
+                                                Status = 1,
+                                                UpdatedAt = DateTime.Now,
+                                            });
+                                        }
+                                    }
+                                    await _OdfPortsService.AsInsertable(ports).ExecuteReturnEntityAsync(true);
+                                    //如果超过100个机框，则休眠一下，防止服务器死机
+                                    index++;
+                                    if (index > 100)
+                                    {
+                                        Thread.Sleep(50);
+                                        index = 0;
+                                    }
+                                }
+
+
+
+                            }
+
+                        }
+
+
+                        successCount++;
+                    }
+                    catch (Exception)
+                    {
+                        errorCount++;
+                    }
+                }
+
+            }
+            return SUCCESS($"导入成功{successCount}条数据，失败{errorCount}");
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..dca1078c1aee51fa399b87801cc048c1e2cd53fb
GIT binary patch
literal 10667
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

literal 0
HcmV?d00001

diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfRooms.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfRooms.xlsx
index ba92ad840031adcf25914e5e9d992b0daf1cc554..dd358d30e7838d527cefdbbaadd36488ad04f6a4 100644
GIT binary patch
literal 10387
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
Vq@h3@1OO00pVuH7t5f{C`hQTU+jjr}

literal 4375
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
M;?>xK^61n50FBTm1ONa4

diff --git a/ZR.Model/Business/Dto/OdfPortsDto.cs b/ZR.Model/Business/Dto/OdfPortsDto.cs
index 1f4c7f3..91a27f5 100644
--- a/ZR.Model/Business/Dto/OdfPortsDto.cs
+++ b/ZR.Model/Business/Dto/OdfPortsDto.cs
@@ -204,6 +204,69 @@ namespace ZR.Model.Business.Dto
         public string DeptName { get; set; }
     }
 
+    /// <summary>
+    /// 端口输入对象
+    /// </summary>
+    public class OdfPortsImportDto
+    {
+        
+ 
+
+        [Required(ErrorMessage = "机房名称不能为空")]
+        [ExcelColumn(Name = "机房名称")]
+        [ExcelColumnName("机房名称")]
+        public string RoomName { get; set; }
+
+      
+
+        [Required(ErrorMessage = "机架名称不能为空")]
+        [ExcelColumn(Name = "机架名称")]
+        [ExcelColumnName("机架名称")]
+        public string RackName { get; set; }
+
+    
+
+        [Required(ErrorMessage = "机框名称不能为空")]
+        [ExcelColumn(Name = "机框名称")]
+        [ExcelColumnName("机框名称")]
+        public string FrameName { get; set; }
+
+        
+
+        [Required(ErrorMessage = "行号不能为空")]
+        [ExcelColumn(Name = "行号（1-6）")]
+        [ExcelColumnName("行号（1-6）")]
+        public int RowNumber { get; set; }
+
+        [Required(ErrorMessage = "端口号（1-12）不能为空")]
+        [ExcelColumn(Name = "端口号（1-12）")]
+        [ExcelColumnName("端口号（1-12）")]
+        public int PortNumber { get; set; }
+
+        [Required(ErrorMessage = "连接状态，0正常，1断开不能为空")]
+        [ExcelColumn(Name = "连接状态，1正常，0断开")]
+        [ExcelColumnName("连接状态，1正常，0断开")]
+        public int Status { get; set; }
+
+        [ExcelColumn(Name = "备注")]
+        [ExcelColumnName("备注")]
+        public string Remarks { get; set; }
+
+        [ExcelColumn(Name = "光衰值（dB）")]
+        [ExcelColumnName("光衰值（dB）")]
+        public string OpticalAttenuation { get; set; }
+
+        [ExcelColumn(Name = "历史故障记录")]
+        [ExcelColumnName("历史故障记录")]
+        public string HistoryRemarks { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        [ExcelColumn(Name = "部门名称")]
+        public string DeptName { get; set; }
+    }
+
 
     /// <summary>
     /// 端口输入输出对象
diff --git a/ZR.Model/Business/Dto/OdfRoomsDto.cs b/ZR.Model/Business/Dto/OdfRoomsDto.cs
index e4c5ed1..a2baa12 100644
--- a/ZR.Model/Business/Dto/OdfRoomsDto.cs
+++ b/ZR.Model/Business/Dto/OdfRoomsDto.cs
@@ -105,9 +105,43 @@ namespace ZR.Model.Business.Dto
         [ExcelColumn(Name = "修改时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)]
         [ExcelColumnName("修改时间")]
         public DateTime? UpdatedAt { get; set; }
+    }
 
+    /// <summary>
+    /// 机房列表输入输出对象
+    /// </summary>
+    public class OdfRoomsImDto
+    {
 
+        [ExcelColumn(Name = "部门名称")]
+        [ExcelColumnName("部门名称")]
+        public string DeptName { get; set; }
 
+        [Required(ErrorMessage = "机房名称不能为空")]
+        [ExcelColumn(Name = "机房名称")]
+        [ExcelColumnName("机房名称")]
+        public string RoomName { get; set; }
+
+        [ExcelColumn(Name = "机房位置")]
+        [ExcelColumnName("机房位置")]
+        public string RoomAddress { get; set; }
+
+        [ExcelColumn(Name = "备注")]
+        [ExcelColumnName("备注")]
+        public string Remarks { get; set; }
+
+        [ExcelColumn(Name = "机架数量")]
+        [ExcelColumnName("机架数量")]
+        public int? RacksCount { get; set; }
+
+ 
+        [ExcelColumn(Name = "机框数量")]
+        [ExcelColumnName("机框数量")]
+        public int? FrameCount { get; set; }
+
+        [ExcelColumn(Name = "是否生成端口数据，1生成，0只导入机房列表")]
+        [ExcelColumnName("是否生成端口数据，1生成，0只导入机房列表")]
+        public int? CreateRoomInfo { get; set; }
     }
 
     /// <summary>