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

yu

Browse Source
master
tayttt 3 months ago
parent 77524c71de
commit a635c7b2af
6 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -33,7 +33,7 @@ using log4net;
namespace Txgy.FilesWatcher.ViewModels
{
internal class MainViewModel : BindableBase
public class MainViewModel : BindableBase
{
public MainViewModel(WebsocketClient websocketClient, SystemConfig systemConfig, IEventAggregator ea, IDialogService dialogService, ManualModeDialogViewModel manualModeDialog)
{
@ -58,6 +58,7 @@ namespace Txgy.FilesWatcher.ViewModels
this._ea = ea;
this._dialogService = dialogService;
this._manualModeDialog = manualModeDialog;
_manualModeDialog.mainModel = this;
}
private GetLogger _log;
private string watcherPath;
@ -202,7 +203,7 @@ namespace Txgy.FilesWatcher.ViewModels
get { return selectedIndex; }
set { SetProperty(ref selectedIndex, value); }
}
private int proMonInterval = 30;
private int proMonInterval = 5;
public int ProMonInterval
{
get => proMonInterval;
@ -503,11 +504,11 @@ namespace Txgy.FilesWatcher.ViewModels
DateTime currentT= DateTime.Now;
RunTime = DateDiff(currentT, StartTime);
// path = "I:\\yuwuN3102mseed\\NET2023\\06\\22\\21\\51";
if ((currentT - mseedFileTime).TotalHours >= CycleTime)
if ((currentT - mseedFileTime).TotalSeconds >= 15)
{
mseedFileTime = DateTime.Now;
DateTime start= DateTime.Now.AddDays(-3);
_manualModeDialog.StartHandle(start, start.AddDays(-4));
//DateTime end= DateTime.Now.AddDays(-3);
_manualModeDialog.StartHandle(mseedFileTime.AddDays(-4), mseedFileTime);
}
else
{

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

@ -41,7 +41,7 @@ namespace Txgy.FilesWatcher.ViewModels
{
cts.Cancel();
}
MainViewModel mainModel;
public MainViewModel mainModel;
public void OnDialogOpened(IDialogParameters parameters)
{
StartTime = DateTime.Now.AddDays(-3);
@ -91,10 +91,10 @@ namespace Txgy.FilesWatcher.ViewModels
public DelegateCommand StartCommand => new DelegateCommand(async () =>
{
if ((EndTime - StartTime).TotalDays > 4)
{
MessageBox.Show("时间区间超范围!");
}
//if ((EndTime - StartTime).TotalDays > 4)
//{
// MessageBox.Show("时间区间超范围!");
//}
StateMes = "执行中";
StartEnable = false;
await StartHandle(StartTime,EndTime);
@ -125,7 +125,7 @@ namespace Txgy.FilesWatcher.ViewModels
}, cancellationToken);
Task task2 = Task.Run(() =>
{
var files = new DirectoryInfo(realtimePath).GetFiles("*.index");
var files = new DirectoryInfo(realtimePath).GetFiles("*.index",SearchOption.AllDirectories);
foreach (var file in files)
{
var lines = File.ReadAllLines(file.FullName);
@ -142,7 +142,7 @@ namespace Txgy.FilesWatcher.ViewModels
}, cancellationToken);
Task task3 = Task.Run(() =>
{
var postFiles = new DirectoryInfo(postPath).GetFiles("*.index");
var postFiles = new DirectoryInfo(postPath).GetFiles("*.index", SearchOption.AllDirectories);
foreach (var file in postFiles)
{
var lines = File.ReadAllLines(file.FullName);

8
Txgy.FilesWatcher/Views/ManualModeDialog.xaml
Unescape Escape View File

@ -21,9 +21,11 @@
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Label Content="开始时间"/>
<DatePicker SelectedDate="{Binding StartTime}" Margin="10,0,0,0" IsEnabled="False"/>
<Label Content="结束时间" Margin="10,0,0,0" Visibility="Collapsed"/>
<DatePicker SelectedDate="{Binding EndTime}" IsEnabled="False" Visibility="Collapsed"/>
<DatePicker SelectedDate="{Binding StartTime}" Margin="10,0,0,0" IsEnabled="True"/>
<Label Content="结束时间" Margin="10,0,0,0" Visibility="Visible"/>
<DatePicker SelectedDate="{Binding EndTime}"
IsEnabled="True"
Visibility="Visible"/>
<Button Content="开始" Command="{Binding StartCommand}"/>
<TextBlock Text="{Binding StateMes}" VerticalAlignment="Center" Margin="20,0,20,0"/>
<Button Content="停止" Command="{Binding ManualCommand}"/>

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

@ -25,7 +25,8 @@
<!--多线程时采用最小锁定-->
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<!--日期的格式，每天换一个文件记录，如不设置则永远只记录一天的日志，需设置-->
<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH&quot;&quot;"/>
<!--<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH.log&quot;&quot;"/>-->
<datePattern value="yyyyMMdd&quot;\\trace_&quot;yyyyMMHH.log"/>
<!--是否追加到文件,默认为true，通常无需设置-->
<appendToFile value="true"/>
<StaticLogFileName value="false"/>
@ -53,7 +54,7 @@
<lockingModel type="log4net.Appender.FileAppender+MinimalLock"/>
<!--日期的格式，每天换一个文件记录，如不设置则永远只记录一天的日志，需设置-->
<datePattern value="yyyyMMdd&quot;\\error_&quot;yyyyMMdd&quot;&quot;"/>
<datePattern value="yyyyMMdd&quot;\\error_&quot;yyyyMMdd&quot;&quot;.log"/>
<!-- 这是按日期产生文件夹，并在文件名前也加上日期 -->
<!--<param name="DatePattern" value="yyyyMMdd/yyyyMMddhhmm&quot;-TimerServer.log&quot;" />-->

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

@ -58,6 +58,14 @@ namespace Txgy.FilesWatcher.model
string EventTime = index_file_line[0].Substring(0, 23);
string OriginTime = EventTime;
//上传前，检查workAreaId和eventTime
{
//int workAreaId = 10;
//string eventTime = "0";
//if (workAreaId == 0 && eventTime == "0")
//{ }
}
//WorkAreaId = 1,更新realtimeeventresult
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);

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

@ -20,7 +20,7 @@
"dbms": "mysql",
"serverIP": "bj-cdb-q64mbxr6.sql.tencentcdb.com",
"port": 60027,
"database": "yuwu2021",
"database": "yuwu2024",
"userName": "yuwudba",
"password": "Yw123456"
},

Write Preview
Loading…
Cancel
Save