From 0bbfa0ba324412eac0871e8c8c3f4972f5c43d44 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 16 Nov 2025 17:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=89=B9=E6=AE=8A=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Business/OdfPortsController.cs            | 83 ++++++++++++++++++-
 ZR.Admin.WebApi/appsettings.json              | 10 +--
 2 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
index 01a8f11..0bfc7db 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
@@ -762,7 +762,8 @@ namespace ZR.Admin.WebApi.Controllers.Business
         /// </summary>
         /// <param name="historyRemarks">原始字符串</param>
         /// <returns>日期+原因集合</returns>
-        private List<(DateTime Date, string Reason)> ParseHistory(string historyRemarks)
+        [Obsolete]
+        private List<(DateTime Date, string Reason)> ParseHistoryf(string historyRemarks)
         {
             var result = new List<(DateTime, string)>();
 
@@ -801,6 +802,86 @@ namespace ZR.Admin.WebApi.Controllers.Business
             return result;
         }
 
+        /// <summary>
+        /// 超强健壮型历史备注解析器，支持以下所有日期格式：
+        /// - 英文：2022/5/3, 2022-10 24, 2022-10-24, 2021/ 12/2
+        /// - 中文：2022年5月3日, 2022年5月3号 9:20
+        /// - 时间：支持无秒，如 8:20、8:5、8:5:1、自动补零
+        /// - 自动修复多余空格
+        /// 
+        /// 最终统一输出 yyyy-MM-dd HH:mm:ss
+        /// </summary>
+        private List<(DateTime Date, string Reason)> ParseHistory(string historyRemarks)
+        {
+            var list = new List<(DateTime, string)>();
+
+            if (string.IsNullOrWhiteSpace(historyRemarks))
+                return list;
+
+            // 支持：
+            // - yyyy/MM/dd
+            // - yyyy- MM dd
+            // - yyyy年M月d日
+            // - yyyy年M月d号
+            // - 时间可为 HH:mm 或 HH:mm:ss
+            var regex = new Regex(
+                @"(?<year>\d{4})\s*(?:[-/年]\s*)?(?<month>\d{1,2})\s*(?:[-/月]\s*)?(?<day>\d{1,2})\s*(?:日|号)?\s+(?<time>\d{1,2}:\d{1,2}(?::\d{1,2})?)",
+                RegexOptions.Compiled);
+
+            string[] lines = historyRemarks.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var line in lines)
+            {
+                var m = regex.Match(line);
+                if (!m.Success)
+                    continue;
+
+                try
+                {
+                    // 年月日
+                    int year = int.Parse(m.Groups["year"].Value);
+                    int month = int.Parse(m.Groups["month"].Value);
+                    int day = int.Parse(m.Groups["day"].Value);
+
+                    // 时间部分处理（支持补全）
+                    string timeRaw = m.Groups["time"].Value.Trim();
+                    string time = NormalizeTime(timeRaw);
+
+                    // 拼成字符串再解析
+                    string dateStr = $"{year:D4}-{month:D2}-{day:D2} {time}";
+
+                    if (DateTime.TryParse(dateStr, out var dt))
+                    {
+                        // 提取事件原因（时间之后全部文字）
+                        string reason = line.Substring(m.Index + m.Length).Trim();
+                        list.Add((dt, reason));
+                    }
+                }
+                catch
+                {
+                    // ignore
+                }
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// 时间字符串标准化：
+        /// - 8:5 → 08:05:00
+        /// - 8:5:3 → 08:05:03
+        /// - 8:20 → 08:20:00
+        /// </summary>
+        private string NormalizeTime(string rawTime)
+        {
+            var parts = rawTime.Split(':');
+
+            string h = parts[0].PadLeft(2, '0');
+            string m = parts[1].PadLeft(2, '0');
+            string s = parts.Length >= 3 ? parts[2].PadLeft(2, '0') : "00";
+
+            return $"{h}:{m}:{s}";
+        }
 
         /// <summary>
         /// 端口导入模板下载
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index b2668db..0373b51 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -14,7 +14,7 @@
     //  "IsAutoCloseConnection": true
     //}
     {
-      "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;",
+      "Conn": "Data Source=192.168.195.15;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
@@ -23,7 +23,7 @@
   //代码生成数据库配置 初始化数据：http://localhost:8888/common/initseedData
   "CodeGenDbConfig": {
     //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
-    "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Encrypt=True;TrustServerCertificate=True;Initial Catalog={dbName};",
+    "Conn": "Data Source=192.168.195.15;User ID=sa;Password=Dbt@com@123;Encrypt=True;TrustServerCertificate=True;Initial Catalog={dbName};",
     "DbType": 1,
     "IsAutoCloseConnection": true,
     "DbName": "OdtAdmin" //代码生成默认连接数据库,Oracle库是实例的名称
@@ -99,8 +99,8 @@
   "RedisServer": {
     "open": 0, //是否启用redis
     "dbCache": false, //数据库是否使用Redis缓存，如果启用open要为1
-    "Cache": "192.168.1.41:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:",
-    "Session": "192.168.1.41:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:"
+    "Cache": "192.168.1.15:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:",
+    "Session": "192.168.1.15:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:"
   },
   //验证码配置
   "CaptchaOptions": {