From 6e8430d51bc804ae17d6fdde46f76742287f684e Mon Sep 17 00:00:00 2001
From: mzhifa <mzhifa@foxmail.com>
Date: Thu, 9 May 2024 23:33:19 +0800
Subject: [PATCH] =?UTF-8?q?1=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=202=20=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Txgy.FilesWatcher/ViewModels/MainViewModel.cs | 2 +-
 Txgy.FilesWatcher/model/UploadMseedFile.cs    | 2 +-
 Txgy.FilesWatcher/model/UploadPostproFile.cs  | 9 +++++++--
 Txgy.FilesWatcher/model/UploadRealtimeFile.cs | 7 ++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Txgy.FilesWatcher/ViewModels/MainViewModel.cs b/Txgy.FilesWatcher/ViewModels/MainViewModel.cs
index 24cca00..b83e060 100644
--- a/Txgy.FilesWatcher/ViewModels/MainViewModel.cs
+++ b/Txgy.FilesWatcher/ViewModels/MainViewModel.cs
@@ -487,7 +487,7 @@ namespace Txgy.FilesWatcher.ViewModels
                         DataList.Add(new FileModel
                         {
                             CreateTime = DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss"),
-                            Data = $"{DateTime.Now.ToString("yyyy-MM-dd T HH:mm:ss")}{a}"
+                            Data = $"{currentT.AddMinutes(-2).ToString("yyyy-MM-dd T HH:mm:ss")}{a}"
                         });
                     });
                 }), path, WorkAreaId);
diff --git a/Txgy.FilesWatcher/model/UploadMseedFile.cs b/Txgy.FilesWatcher/model/UploadMseedFile.cs
index 7399d37..86ccf2f 100644
--- a/Txgy.FilesWatcher/model/UploadMseedFile.cs
+++ b/Txgy.FilesWatcher/model/UploadMseedFile.cs
@@ -43,7 +43,7 @@ namespace Txgy.FilesWatcher.model
                         if (a == 0)
                         {
                             //WorkAreaId = 1,更新
-                            mes += file.Substring(3, 3);
+                            mes += file.Substring(3, 3) + ",";
                             FileStream fs = new FileStream(DFile.FullName, FileMode.Open, FileAccess.Read);
                             BinaryReader mbr = new BinaryReader(fs);
                             Byte[] mseedDatas = mbr.ReadBytes((int)fs.Length);
diff --git a/Txgy.FilesWatcher/model/UploadPostproFile.cs b/Txgy.FilesWatcher/model/UploadPostproFile.cs
index c7b4393..7f32241 100644
--- a/Txgy.FilesWatcher/model/UploadPostproFile.cs
+++ b/Txgy.FilesWatcher/model/UploadPostproFile.cs
@@ -39,7 +39,11 @@ namespace Txgy.FilesWatcher.model
                         var a = conn.QueryFirst<int>(sqlNumber);
                         if (a == 0)
                         {
-                            string[] index_file_line = eventMessage.Split(" ");
+                            string[] index_file_line = eventMessage.Split(" ",StringSplitOptions.RemoveEmptyEntries);
+                            if (index_file_line[4]== "None")
+                            {
+                                index_file_line[5] = "-4";
+                            }
                             string EventTime = index_file_line[0].Substring(0, 23);
                             string OriginTime = EventTime;
 
@@ -92,7 +96,8 @@ namespace Txgy.FilesWatcher.model
                 foreach (var dFile in Dfiles)
                 {
                     string file = dFile.Name;
-                    string[] index_file_line = eventMessage.Split(" ");
+                    string[] index_file_line = eventMessage.Split(" ", StringSplitOptions.RemoveEmptyEntries);
+
                     string EventTime = index_file_line[0].Substring(0, 23);
                     string OriginTime = EventTime;
                     //.json文件
diff --git a/Txgy.FilesWatcher/model/UploadRealtimeFile.cs b/Txgy.FilesWatcher/model/UploadRealtimeFile.cs
index 586d958..5f7a12b 100644
--- a/Txgy.FilesWatcher/model/UploadRealtimeFile.cs
+++ b/Txgy.FilesWatcher/model/UploadRealtimeFile.cs
@@ -45,7 +45,12 @@ namespace Txgy.FilesWatcher.model
                         var a = conn.QueryFirst<int>(sqlNumber);
                         if (a==0)
                         {
-                            string[] index_file_line = eventMessage.Split(" ");
+                            string[] index_file_line = eventMessage.Split(" ", StringSplitOptions.RemoveEmptyEntries);
+                            if (index_file_line[4] == "None")
+                            {
+                                index_file_line[5] = "-4";
+                            }
+
                             string EventTime = index_file_line[0].Substring(0, 23);
                             string OriginTime = EventTime;