mingzf
/
Txgy.FilesWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.停止时，关闭文件监控；

Browse Source 
2.上传逻辑;
3.去掉报错弹窗;
4 增加工区配置；
master
mzhifa 5 months ago
parent a635c7b2af
commit f7e8b01149
9 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File

17
Txgy.FilesWatcher/ViewModels/MainViewModel.cs
Unescape Escape View File

@ -48,6 +48,8 @@ namespace Txgy.FilesWatcher.ViewModels
MseedPath = systemConfig.mseedpath;
MainPath= systemConfig.mainpath;
ToolPath = systemConfig.toolpath;
WorkAreaId = systemConfig.workAreaId;
CycleTime = systemConfig.cycleTime;
DataBaseConnect.GetInstance.DataBaseConfig = systemConfig.dBConfig;
@ -124,7 +126,7 @@ namespace Txgy.FilesWatcher.ViewModels
set { SetProperty(ref isUploadPostPath, value); }
}
private bool isUploadDB = false;
private bool isUploadDB = true;
public bool IsUploadDB
{
@ -294,6 +296,9 @@ namespace Txgy.FilesWatcher.ViewModels
timerTool.Start();
StartConnectMQ();
mseedFileTime = DateTime.Now;
_systemConfig.cycleTime = CycleTime;
_systemConfig.workAreaId = WorkAreaId;
UpdateJsonConfig(_systemConfig);
}
}
@ -504,7 +509,7 @@ namespace Txgy.FilesWatcher.ViewModels
DateTime currentT= DateTime.Now;
RunTime = DateDiff(currentT, StartTime);
// path = "I:\\yuwuN3102mseed\\NET2023\\06\\22\\21\\51";
if ((currentT - mseedFileTime).TotalSeconds >= 15)
if ((currentT - mseedFileTime).TotalSeconds >= CycleTime)
{
mseedFileTime = DateTime.Now;
//DateTime end= DateTime.Now.AddDays(-3);
@ -519,8 +524,6 @@ namespace Txgy.FilesWatcher.ViewModels
private void MseedFileChanged(DateTime currentT)
{
_log.Log.Debug("MainViewModel.MseedFileChanged() > enter....");
_log.Log.DebugFormat("MainViewModel.MseedFileChanged() currentT:{0}", currentT);
string path = $"{Path.Combine(MainPath, MseedPath)}/{currentT.Month.ToString("D2")}/{currentT.Day.ToString("D2")}/{currentT.Hour.ToString("D2")}/{currentT.AddMinutes(-2).Minute.ToString("D2")}";
Debug.WriteLine($"**********当前时间：{currentT},监控路径:{path}");
if (Directory.Exists(path) && IsUploadDB && IsUploadMseedPath)
@ -538,8 +541,6 @@ namespace Txgy.FilesWatcher.ViewModels
});
}), path, WorkAreaId);
}
_log.Log.Debug("MainViewModel.MseedFileChanged() < exit....");
}
@ -567,8 +568,8 @@ namespace Txgy.FilesWatcher.ViewModels
}
}
}
watcherArray[0].EnableRaisingEvents =IsUploadRealtimePath;
watcherArray[1].EnableRaisingEvents = IsUploadPostPath;
watcherArray[0].EnableRaisingEvents = IsUploadRealtimePath && IsEnableRaising;
watcherArray[1].EnableRaisingEvents = IsUploadPostPath && IsEnableRaising;
IsIndeterminate = IsEnableRaising;
}
catch (Exception ex)

9
Txgy.FilesWatcher/ViewModels/ManualModeDialogViewModel.cs
Unescape Escape View File

@ -105,7 +105,6 @@ namespace Txgy.FilesWatcher.ViewModels
CancellationTokenSource cts = new CancellationTokenSource();
public async Task StartHandle(DateTime start, DateTime end)
{
_log.Log.Debug("ManualModeDialogViewModel.StartHandle() > enter...");
_log.Log.DebugFormat("ManualModeDialogViewModel.StartHandle() start:{0},end:{1}",start, end);
CancellationToken cancellationToken = cts.Token;
string realtimePath = Path.Combine(mainModel.MainPath, mainModel.RealtimePath);
@ -158,7 +157,6 @@ namespace Txgy.FilesWatcher.ViewModels
}
}, cancellationToken);
await Task.WhenAll(task1, task2, task3);
_log.Log.Debug("ManualModeDialogViewModel.StartHandle() < exit...");
}
@ -169,7 +167,6 @@ namespace Txgy.FilesWatcher.ViewModels
private void MseedUpload(DateTime currentT)
{
_log.Log.Debug("ManualModeDialogViewModel.MseedUpload() > enter...");
string path = $"{Path.Combine(mainModel.MainPath, mainModel.MseedPath)}/{currentT.Month.ToString("D2")}/{currentT.Day.ToString("D2")}/{currentT.Hour.ToString("D2")}/{currentT.Minute.ToString("D2")}";
// path = "I:\\yuwuN3102mseed\\NET2023\\06\\22\\21\\51";
Debug.WriteLine($"**********当前时间：{currentT},监控路径:{path}");
@ -189,13 +186,10 @@ namespace Txgy.FilesWatcher.ViewModels
});
}), path, mainModel.WorkAreaId);
}
_log.Log.Debug("ManualModeDialogViewModel.MseedUpload() < exit...");
}
private void RealtimeChanged(string filePath, string lastLine)
{
_log.Log.Debug("ManualModeDialogViewModel.RealtimeChanged() > enter...");
// string tmp = dt.Hour.ToString() + "时" + dt.Minute.ToString() + "分" + dt.Second.ToString() + "秒" + dt.Millisecond.ToString() + "毫秒,目录发生变化\r\n";
DateTime lastWriteTime = DateTime.Now; //File.GetLastWriteTime(e.FullPath);
Debug.WriteLine($"最后修改时间：{lastWriteTime},文件路径：{filePath}");
@ -224,13 +218,11 @@ namespace Txgy.FilesWatcher.ViewModels
}, filePath, lastLine);
}
_log.Log.Debug("ManualModeDialogViewModel.RealtimeChanged() < exit...");
}
private void PostChanged(string filePath, string lastLine)
{
_log.Log.Debug("ManualModeDialogViewModel.PostChanged() > enter...");
// string tmp = dt.Hour.ToString() + "时" + dt.Minute.ToString() + "分" + dt.Second.ToString() + "秒" + dt.Millisecond.ToString() + "毫秒,目录发生变化\r\n";
DateTime lastWriteTime = DateTime.Now; //File.GetLastWriteTime(e.FullPath);
Debug.WriteLine($"最后修改时间：{lastWriteTime},文件路径：{filePath}");
@ -264,7 +256,6 @@ namespace Txgy.FilesWatcher.ViewModels
});
}, filePath, lastLine);
}
_log.Log.Debug("ManualModeDialogViewModel.PostChanged() < exit...");
}
private DispatcherTimer timer1 = new DispatcherTimer();

2
Txgy.FilesWatcher/Views/MainView.xaml
Unescape Escape View File

@ -128,7 +128,7 @@
</GroupBox>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<TextBlock Text="自动处理时间间隔(小时)：" VerticalAlignment="Center"/>
<TextBlock Text="自动处理时间间隔(秒)：" VerticalAlignment="Center"/>
<hc:NumericUpDown Value="{Binding CycleTime}"/>
</StackPanel>
<Button Content="手动处理" Command="{Binding ManualCommand}" Margin="0,20,0,0"/>

2
Txgy.FilesWatcher/log4net.config
Unescape Escape View File

@ -26,7 +26,7 @@
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<!--日期的格式，每天换一个文件记录，如不设置则永远只记录一天的日志，需设置-->
<!--<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH.log&quot;&quot;"/>-->
<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH.log"/>
<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH"/>
<!--是否追加到文件,默认为true，通常无需设置-->
<appendToFile value="true"/>
<StaticLogFileName value="false"/>

2
Txgy.FilesWatcher/model/SystemConfig.cs
Unescape Escape View File

@ -16,6 +16,8 @@ namespace Txgy.FilesWatcher.model
public string toolpath { get; set; }
public int cycleTime { get; set; }
public int workAreaId { get; set; }
public MQTTConfig mQTTConfig { get; set; }
public DBConfig dBConfig { get; set; }

3
Txgy.FilesWatcher/model/UploadMseedFile.cs
Unescape Escape View File

@ -23,7 +23,6 @@ namespace Txgy.FilesWatcher.model
public static void UploadMSeedOnce(Action<string> mseedAction, string path, int workAreaId)
{
GetLogger _log = new GetLogger("UploadMseedFile");
_log.Log.Debug("UploadMseedFile.UploadMSeedOnce() > enter....");
_log.Log.DebugFormat("UploadMseedFile.UploadMSeedOnce() path:{0},workAreaId:{1}", path, workAreaId);
try
{
@ -75,8 +74,6 @@ namespace Txgy.FilesWatcher.model
{
_log.Log.ErrorFormat("UploadMseedFile.UploadMSeedOnce()() error:{0}", ex);
}
_log.Log.Debug("UploadMseedFile.UploadMSeedOnce()() < exit....");
}
}

31
Txgy.FilesWatcher/model/UploadPostproFile.cs
Unescape Escape View File

@ -20,7 +20,6 @@ namespace Txgy.FilesWatcher.model
public static void UploadPostproFileOnce(string path, string eventMessage, int workAreaId , out bool isUpload)
{
GetLogger _log = new GetLogger("UploadPostproFile");
_log.Log.Debug("UploadPostproFile.UploadPostproFileOnce() > enter....");
_log.Log.DebugFormat("UploadPostproFile.UploadPostproFileOnce() path:{0},eventMessage:{1},workAreaId:{2}", path, eventMessage, workAreaId);
isUpload = false;
try
@ -50,12 +49,28 @@ namespace Txgy.FilesWatcher.model
}
string EventTime = index_file_line[0].Substring(0, 23);
string OriginTime = EventTime;
//WorkAreaId = 1,更新realtimeeventresult
//.json文件
string JPath = dFile.FullName.Replace(".mseed", "A.json");
if (File.Exists(JPath))
{
string mes = File.ReadAllText(JPath);
if (!mes.Contains(EventTime))
{
//和json文件的otime 时间需要一致
continue;
}
}
// 上传前，检查workAreaId和eventTime
sqlNumber = $"SELECT COUNT(*) FROM {tbrealtimeresult} WHERE WorkAreaId = '{workAreaId}' && EventTime='{EventTime}'";
cmd = new MySqlCommand(sqlNumber, conn);
int b = conn.QueryFirst<int>(sqlNumber);
if (b == 0)
{
sqlNumber = $"INSERT INTO {tbrealtimeresult}(WorkAreaId, EventTime, OriginTime, X, Y, Z, ML, LocSta, MLSta, RMS) VALUES('{workAreaId}', '{EventTime}', '{OriginTime}', '{index_file_line[1]}', '{index_file_line[2]}', '{index_file_line[3]}', '{index_file_line[5]}', '{index_file_line[7]}', '{index_file_line[8]}', '{index_file_line[6]}')";
var res = conn.Execute(sqlNumber);
isUpload = true;
_log.Log.DebugFormat("UploadPostproFileOnce() 上传数据表:{0},eventMessage:{1}", tbrealtimeresult, eventMessage);
}
isUpload = true;
// .mseed文件
FileStream fs = new FileStream(dFile.FullName, FileMode.Open, FileAccess.Read);
BinaryReader mbr = new BinaryReader(fs);
@ -83,12 +98,12 @@ namespace Txgy.FilesWatcher.model
{
sqlNumber = $"INSERT INTO {tbname} (EventTime, WorkAreaID, WaveData, JsonFile) VALUES('{EventTime}', '{workAreaId}', @mDatas, @jDatas);";
MySqlCommand mycomm = new MySqlCommand(sqlNumber, conn);
res = conn.Execute(sqlNumber, new { mDatas = mseedDatas, jDatas = jsonDatas });
conn.Execute(sqlNumber, new { mDatas = mseedDatas, jDatas = jsonDatas });
_log.Log.DebugFormat("UploadPostproFileOnce() 上传数据表:{0}", tbname);
}
sqlNumber = $"INSERT INTO {uploadedtbname}(filename, uploadtime) VALUES('{file}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}')";
res = conn.Execute(sqlNumber);
conn.Execute(sqlNumber);
_log.Log.DebugFormat("UploadPostproFileOnce() 上传数据表:{0},文件:{1}", uploadedtbname, file);
}
}
@ -97,14 +112,11 @@ namespace Txgy.FilesWatcher.model
catch (Exception ex)
{
_log.Log.ErrorFormat("UploadPostproFile.UploadPostproFileOnce() error:{0}", ex);
System.Windows.MessageBox.Show(ex.ToString());
}
_log.Log.Debug("UploadPostproFile.UploadPostproFileOnce() < exit....");
}
public static void UploadPostproFileMQ(Action<string, string> mqAction, string path, string eventMessage)
{
GetLogger _log = new GetLogger("UploadPostproFile");
_log.Log.Debug("UploadPostproFile.UploadPostproFileMQ() > enter....");
_log.Log.DebugFormat("UploadPostproFile.UploadPostproFileMQ() path:{0},eventMessage:{1}", path, eventMessage);
try
{
@ -141,7 +153,6 @@ namespace Txgy.FilesWatcher.model
{
_log.Log.ErrorFormat("UploadPostproFile.UploadPostproFileMQ() error:{0}", ex);
}
_log.Log.Debug("UploadPostproFile.UploadPostproFileMQ() < exit....");
}
}

38
Txgy.FilesWatcher/model/UploadRealtimeFile.cs
Unescape Escape View File

@ -26,7 +26,6 @@ namespace Txgy.FilesWatcher.model
public static void UploadRealtimeFileOnce(string path, string eventMessage, int workAreaId, out bool isUpload)
{
GetLogger _log = new GetLogger("UploadRealtimeFile");
_log.Log.Debug("UploadRealtimeFile.UploadRealtimeFileOnce() > enter....");
_log.Log.DebugFormat("UploadRealtimeFile.UploadRealtimeFileOnce() path:{0},eventMessage:{1},workAreaId:{2}", path, eventMessage, workAreaId);
isUpload = false;
try
@ -57,20 +56,29 @@ namespace Txgy.FilesWatcher.model
string EventTime = index_file_line[0].Substring(0, 23);
string OriginTime = EventTime;
//上传前，检查workAreaId和eventTime
//.json文件
string JPath = dFile.FullName.Replace(".mseed", "A.json");
if(File.Exists(JPath))
{
string mes= File.ReadAllText(JPath);
if (!mes.Contains(EventTime))
{
//int workAreaId = 10;
//string eventTime = "0";
//if (workAreaId == 0 && eventTime == "0")
//{ }
//和json文件的otime 时间需要一致
continue;
}
}
//WorkAreaId = 1,更新realtimeeventresult
// 上传前，检查workAreaId和eventTime
sqlNumber = $"SELECT COUNT(*) FROM {tbrealtimeresult} WHERE WorkAreaId = '{workAreaId}' && EventTime='{EventTime}'";
cmd = new MySqlCommand(sqlNumber, conn);
int b = conn.QueryFirst<int>(sqlNumber);
if (b == 0)
{
sqlNumber = $"INSERT INTO {tbrealtimeresult}(WorkAreaId, EventTime, OriginTime, X, Y, Z, ML, LocSta, MLSta, RMS) VALUES('{workAreaId}', '{EventTime}', '{OriginTime}', '{index_file_line[1]}', '{index_file_line[2]}', '{index_file_line[3]}', '{index_file_line[5]}', '{index_file_line[7]}', '{index_file_line[8]}', '{index_file_line[6]}')";
var res = conn.Execute(sqlNumber);
isUpload = true;
conn.Execute(sqlNumber);
_log.Log.DebugFormat("UploadRealtimeFileOnce() 上传数据表:{0},eventMessage:{1}", tbrealtimeresult, eventMessage);
}
isUpload = true;
// .mseed文件
FileStream fs = new FileStream(dFile.FullName, FileMode.Open, FileAccess.Read);
BinaryReader mbr = new BinaryReader(fs);
@ -97,12 +105,11 @@ namespace Txgy.FilesWatcher.model
{
sqlNumber = $"INSERT INTO {tbname} (EventTime, WorkAreaID, WaveData, JsonFile) VALUES('{EventTime}', '{workAreaId}', @mDatas, @jDatas);";
MySqlCommand mycomm = new MySqlCommand(sqlNumber, conn);
res = conn.Execute(sqlNumber, new { mDatas = mseedDatas, jDatas = jsonDatas });
conn.Execute(sqlNumber, new { mDatas = mseedDatas, jDatas = jsonDatas });
_log.Log.DebugFormat("UploadRealtimeFileOnce() 上传数据表:{0}", tbname);
}
sqlNumber = $"INSERT INTO {uploadedtbname}(filename, uploadtime) VALUES('{file}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}')";
res = conn.Execute(sqlNumber);
int res = conn.Execute(sqlNumber);
_log.Log.DebugFormat("UploadRealtimeFileOnce() 上传数据表:{0},文传:{1}", uploadedtbname, file);
}
@ -112,15 +119,12 @@ namespace Txgy.FilesWatcher.model
catch (Exception ex)
{
_log.Log.ErrorFormat("UploadRealtimeFile.UploadRealtimeFileOnce() error:{0}", ex);
MessageBox.Show(ex.ToString());
}
_log.Log.Debug("UploadRealtimeFile.UploadRealtimeFileOnce() < exit....");
}
public static void UploadRealtimeFileMQ(Action<string, string> mqAction, string path, string eventMessage)
{
GetLogger _log = new GetLogger("UploadRealtimeFile");
_log.Log.Debug("UploadRealtimeFile.UploadRealtimeFileMQ() > enter....");
_log.Log.DebugFormat("UploadRealtimeFile.UploadRealtimeFileMQ() path:{0},eventMessage:{1}", path, eventMessage);
try
{
@ -151,10 +155,8 @@ namespace Txgy.FilesWatcher.model
}
catch (Exception ex)
{
//MessageBox.Show(ex.ToString());
_log.Log.ErrorFormat("UploadRealtimeFile.UploadRealtimeFileMQ() error:{0}", ex);
}
_log.Log.Debug("UploadRealtimeFile.UploadRealtimeFileMQ() < exit....");
}
}

3
Txgy.FilesWatcher/systemconfig.json
Unescape Escape View File

@ -9,6 +9,9 @@
"toolpath": "post20231119",
//原始波形目录
"mseedpath": "NET2023",
//工区号
"workAreaId": 8,
"cycleTime": 3600,
"mQTTConfig": {
"serverIP": "49.232.209.49",
"port": 1883,

Write Preview
Loading…
Cancel
Save