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(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(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;