From 1a9d3924b0edd6db3e9566efe8ba203785868df2 Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Thu, 8 May 2025 17:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=88=E7=AB=AF=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E6=97=B6=E9=92=9F=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs            | 5 ++++-
 .../AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs           | 2 +-
 .../Appendix/Appendix_A1.cs                              | 9 ++++++---
 web/JiShe.CollectBus.Host/Pages/Monitor.cshtml           | 1 -
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
index 2bc496f..5bac5c7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
@@ -6,6 +6,8 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+using System.Diagnostics.Metrics;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
 {
@@ -71,7 +73,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
             {
                 await _analysisStrategyContext.ExecuteAsync<List<string>>(nameof(Appendix_A1), arr, (value) =>
                 {
-                    dto.DataValue = value;
+                    var data = (Tuple<string, string>)value;
+                    dto.DataValue = $"{data.Item1} {data.Item2}";
                 });
             }
             dto.DataType  = dataType;
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
index c54d058..f4dd742 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
@@ -54,7 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                             dto.DataValue = value;
                     }
                     dto.DataType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}_{DataType[i]}";
-                    dto.FiledName = DataType[i].GetDataFieldByGatherDataType() ?? string.Empty;
+                    dto.FiledName = dto.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
                     dto.FiledDesc= remarks[i];
                     list.Add(dto);
                 }
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
index 05d45d9..eadc9a3 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
@@ -21,10 +21,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.Appendix
             var day = data[3];
             string binString = data[4].HexTo4BinZero();
             var months = (binString.Substring(3, 1).BinToDec() * 10) + Convert.ToInt32(binString.Substring(4, 4).BinToHex());
-            var week = binString.Substring(0, 3).HexTo4BinZero();
+            var week = binString.Substring(0, 3).BinToHex();
             var year = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{data[5]}";
-            string date= $"{year}-{months.ToString().PadLeft(2, '0')}-{day} {hours}:{minutes}:{seconds}_{week}";
-            result?.Invoke(date);
+            string date= $"{year}-{months.ToString().PadLeft(2, '0')}-{day} {hours}:{minutes}:{seconds}";
+            string[] weekdays = {"", "星期一", "星期二", "星期三","星期四", "星期五", "星期六", "星期日"};
+            int.TryParse(week, out int weekday);
+            // Item1=日期，Item2=星期几
+            result?.Invoke(Tuple.Create(date, weekdays[weekday]));
             return await Task.FromResult(true);
         }
 
diff --git a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
index 30e91e8..a58ded5 100644
--- a/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
+++ b/web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
@@ -16,7 +16,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <title>后端服务</title>
-
 </head>
    
 <body>