提交

ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs

@@ -286,7 +286,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
         /// <returns></returns>
         [HttpPost("save")]
         [ActionPermissionFilter(Permission = "odfports:edit")]
-        [Log(Title = "APP更新端口", BusinessType = BusinessType.UPDATE)]
+        [Log(Title = "APP修改端口", BusinessType = BusinessType.UPDATE)]
         public IActionResult SaveMOdfPorts([FromBody] OdfPortsMMDto parm)
         {
             var port = _OdfPortsService.GetById(parm.Id);
@@ -298,6 +298,8 @@ namespace ZR.Admin.WebApi.Controllers.Business
             port.HistoryRemarks = parm.HistoryRemarks;
             port.Remarks = parm.Remarks;
             port.OpticalAttenuation = parm.OpticalAttenuation;
+            port.UpdatedAt = DateTime.Now;
+            port.OpticalCableOffRemarks = parm.OpticalCableOffRemarks;
             if (port.Status == 0)
             {
                 port.Remarks = "";
@@ -505,6 +507,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                                 Remarks = excelItem.Remarks?.Trim(),
                                 OpticalAttenuation = excelItem.OpticalAttenuation?.Trim(),
                                 HistoryRemarks = excelItem.HistoryRemarks?.Trim(),
+                                OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks
                             };
                             await _OdfPortsService.InsertAsync(port);
                             addPortCount++;
@@ -515,6 +518,8 @@ namespace ZR.Admin.WebApi.Controllers.Business
                             port.Remarks = excelItem.Remarks?.Trim();
                             port.OpticalAttenuation = excelItem.OpticalAttenuation?.Trim();
                             port.Status = excelItem.Status;
+                            port.OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks;
+                            port.UpdatedAt = DateTime.Now;
                             await _OdfPortsService.UpdateAsync(port);
                         }
                         successCount++;

ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs

@@ -108,7 +108,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                     {
                         Key = it.Id.ToString(),
                         Id = it.Id.ToString(),
-                        Name = it.RoomName,
+                        Name = it.RoomName + $"[{it.DeptName}]",
                         DeptId = it.DeptId ?? 0,
                         Level = 2,
                         Leaf = false,

ZR.Admin.WebApi/appsettings.json

@@ -8,7 +8,7 @@
   },
   "dbConfigs": [
     {
-      "Conn": "Data Source=49.233.115.141;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;",
+      "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;",
       "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
       "ConfigId": "0", //多租户唯一标识
       "IsAutoCloseConnection": true
@@ -17,7 +17,7 @@
   //代码生成数据库配置 初始化数据：http://localhost:8888/common/initseedData
   "CodeGenDbConfig": {
     //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
-    "Conn": "Data Source=49.233.115.141;User ID=sa;Password=Dbt@com@123;Encrypt=True;TrustServerCertificate=True;Initial Catalog={dbName};",
+    "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Encrypt=True;TrustServerCertificate=True;Initial Catalog={dbName};",
     "DbType": 1,
     "IsAutoCloseConnection": true,
     "DbName": "OdtAdmin" //代码生成默认连接数据库,Oracle库是实例的名称

ZR.Model/Business/Dto/OdfPortsDto.cs

@@ -14,6 +14,8 @@ namespace ZR.Model.Business.Dto
         public string Remarks { get; set; }
         public string OpticalAttenuation { get; set; }
         public string HistoryRemarks { get; set; }
+
+        public string OpticalCableOffRemarks { get; set; }
     }
 
     /// <summary>
@@ -39,6 +41,7 @@ namespace ZR.Model.Business.Dto
         /// </summary>
         public string HistoryRemarks { get; set; }
 
+        public string OpticalCableOffRemarks { get; set; }
 
         /// <summary>
         /// 机房id
@@ -168,6 +171,12 @@ namespace ZR.Model.Business.Dto
         [ExcelColumnName("光衰值（dB）")]
         public string OpticalAttenuation { get; set; }
 
+
+
+        [ExcelColumn(Name = "光缆断信息")]
+        [ExcelColumnName("光缆断信息")]
+        public string OpticalCableOffRemarks { get; set; }
+
         [ExcelColumn(Name = "历史故障表")]
         [ExcelColumnName("历史故障表")]
         public string HistoryRemarks { get; set; }
@@ -202,6 +211,7 @@ namespace ZR.Model.Business.Dto
         /// </summary>
         [ExcelColumn(Name = "部门名称")]
         public string DeptName { get; set; }
+ 
     }
 
     /// <summary>
@@ -265,6 +275,13 @@ namespace ZR.Model.Business.Dto
         /// </summary>
         [ExcelColumn(Name = "部门名称")]
         public string DeptName { get; set; }
+
+        /// <summary>
+        /// 光缆断信息
+        /// </summary>
+        [ExcelColumn(Name = "光缆断信息")]
+        [ExcelColumnName("光缆断信息")]
+        public string OpticalCableOffRemarks { get; set; }
     }
 
 
@@ -368,5 +385,10 @@ namespace ZR.Model.Business.Dto
         [ExcelColumnName("历史故障表")]
         public string HistoryRemarks { get; set; }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public string OpticalCableOffRemarks { get; set; }
+
     }
 }

ZR.Model/Business/OdfPorts.cs

@@ -98,5 +98,10 @@ namespace ZR.Model.Business
         /// </summary>
         public DateTime? UpdatedAt { get; set; }
 
+        /// <summary>
+        /// 光缆断信息
+        /// </summary>
+        public string OpticalCableOffRemarks { get; set; }
+
     }
 }

ZR.Service/Business/OdfPortsService.cs

@@ -188,6 +188,10 @@ namespace ZR.Service.Business
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Remarks), it => it.Remarks.Contains(parm.Remarks));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.OpticalAttenuation), it => it.OpticalAttenuation.Contains(parm.OpticalAttenuation));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.HistoryRemarks), it => it.HistoryRemarks.Contains(parm.HistoryRemarks));
+            if (!string.IsNullOrEmpty(parm.OpticalCableOffRemarks))
+            {
+                predicate = predicate.And(f => f.OpticalCableOffRemarks.Contains(parm.OpticalCableOffRemarks));
+            }
             return predicate;
         }
 
@@ -223,6 +227,10 @@ namespace ZR.Service.Business
             {
                 predicate = predicate.And(f => f.HistoryRemarks.Contains(parm.HistoryRemarks));
             }
+            if (!string.IsNullOrEmpty(parm.OpticalCableOffRemarks))
+            {
+                predicate = predicate.And(f => f.OpticalCableOffRemarks.Contains(parm.OpticalCableOffRemarks));
+            }
             return predicate;
         }
     }