tayttt
/
StartServerWPF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改测试问题；

Browse Source
master
mzhifa 2 years ago
parent 7ddb0a75b0
commit 3d3adbf17c
5 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File

1
StartServerWPF.Modules.Main/Models/MsEventModel.cs
Unescape Escape View File

@ -24,6 +24,7 @@ namespace StartServerWPF.Modules.Main.Models
{ {
this.eventMessage = message; this.eventMessage = message;
string[] evtS = message.Trim(' ').Split(new char[] { ' ' }); string[] evtS = message.Trim(' ').Split(new char[] { ' ' });
CurrentTime = DateTime.Now;
OriginTime = DateTime.Parse(evtS[0]); OriginTime = DateTime.Parse(evtS[0]);
EastCoordinate = double.Parse(evtS[2]); EastCoordinate = double.Parse(evtS[2]);
NorthCoordinate = double.Parse(evtS[1]); NorthCoordinate = double.Parse(evtS[1]);

17
StartServerWPF.Modules.Main/ViewModels/DataProcessViewModel.cs
Unescape Escape View File

@ -236,7 +236,6 @@ namespace StartServerWPF.Modules.Main.ViewModels
MessageBox.Show("内容不能为空", "提示", MessageBoxButton.OK); MessageBox.Show("内容不能为空", "提示", MessageBoxButton.OK);
return; return;
} }
var time = (EndSelectedDate.AddSeconds(-EndSelectedDate.Second) - StartSelectedDate.AddSeconds(-StartSelectedDate.Second)); var time = (EndSelectedDate.AddSeconds(-EndSelectedDate.Second) - StartSelectedDate.AddSeconds(-StartSelectedDate.Second));
if (time.TotalMinutes < 1) if (time.TotalMinutes < 1)
{ {
@ -245,10 +244,12 @@ namespace StartServerWPF.Modules.Main.ViewModels
} }
DateTime dateTime = StartSelectedDate; DateTime dateTime = StartSelectedDate;
string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath"; string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath";
if (!Directory.Exists(temPath)) //清除临时文件
if (Directory.Exists(temPath))
{ {
Directory.CreateDirectory(temPath); Directory.Delete(temPath, true);
} }
Directory.CreateDirectory(temPath);
Task.Run(() => Task.Run(() =>
{ {
IsBusy = false; IsBusy = false;
@ -378,11 +379,11 @@ namespace StartServerWPF.Modules.Main.ViewModels
Debug.WriteLine($"****数据处理程序退出，{e.ToString()}******************"); Debug.WriteLine($"****数据处理程序退出，{e.ToString()}******************");
IsBusy = true; IsBusy = true;
//处理完成后删除临时文件 //处理完成后删除临时文件
string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath"; //string temPath = Path.GetPathRoot(_workareaModel.savepath) + "temPath";
if (Directory.Exists(temPath)) //if (Directory.Exists(temPath))
{ //{
Directory.Delete(temPath, true); // Directory.Delete(temPath, true);
} //}
//解析处理后的事件文件 //解析处理后的事件文件
var fileName = Directory.GetFiles(SavePath, "*.index", SearchOption.AllDirectories); var fileName = Directory.GetFiles(SavePath, "*.index", SearchOption.AllDirectories);
List<string> lines = new List<string>(); List<string> lines = new List<string>();

6
StartServerWPF.Modules.Main/Views/DataProcessView.xaml
Unescape Escape View File

@ -117,15 +117,15 @@
<TextBlock Text="事件列表" FontSize="15" VerticalAlignment="Center" /> <TextBlock Text="事件列表" FontSize="15" VerticalAlignment="Center" />
<DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False"> <DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="消息时间" Width="*" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="发震时刻" Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="发震时刻" Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/> <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
<DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/> <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
<DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/> <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>
<DataGridTextColumn Header="震级(ML)" Width="*" Binding="{Binding ML}"/> <DataGridTextColumn Header="震级(ML)" Width="*" Binding="{Binding ML}"/>
<DataGridTextColumn Header="能量(m)" Width="*" Binding="{Binding Energy}"/> <DataGridTextColumn Header="能量(m)" Width="*" Binding="{Binding Energy}"/>
<DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding NorthCoordinate}"/> <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
<DataGridTextColumn Header="发送状态(m)" Width="*" Binding="{Binding IsSend}"/> <!--<DataGridTextColumn Header="发送状态(m)" Width="*" Binding="{Binding IsSend}"/>-->
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Grid> </Grid>

8
StartServerWPF.Modules.Main/Views/MainView.xaml
Unescape Escape View File

@ -133,8 +133,8 @@
<TextBlock Text="实时处理事件" FontSize="15" VerticalAlignment="Center" /> <TextBlock Text="实时处理事件" FontSize="15" VerticalAlignment="Center" />
<DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False"> <DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="消息时间" Width="*" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="发震时刻" Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="发震时刻" Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/> <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
<DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/> <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
<DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/> <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>
@ -155,8 +155,8 @@
<TextBlock Text="后处理事件" FontSize="15"/> <TextBlock Text="后处理事件" FontSize="15"/>
<DataGrid Grid.Row="1" ItemsSource="{Binding ToolsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False"> <DataGrid Grid.Row="1" ItemsSource="{Binding ToolsEventSource}" Background="White" IsReadOnly="True" AutoGenerateColumns="False">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="消息时间" Width="*" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="发震时刻" Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/> <DataGridTextColumn Header="发震时刻" Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
<DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/> <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
<DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/> <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
<DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/> <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>

80
StartServerWPF/serverprogram/tools/apms.json
Unescape Escape View File

@ -1,39 +1,47 @@
{ {
"station" :"N3102_staion_20230403.csv", "station": "I:/DATA/workarea/n2017/N2107_1116.csv",
"ttime":[{"station":"ttime","ttime2d":"ttime_gw20210427.tab"}], "ttime": [
"Main.log_level":"DEBUG", {
"Main.slice_seconds": 30 , "station": "ttime",
"Main.overlap_seconds": 10 , "ttime2d": "I:/DATA/workarea/n2017/ttime_gw20210427.tab"
"Main.is_mag":"YES", }
"Main.is_write_slice":"NO",
"Main.lon":38398463.49,
"Main.lat":4031112.103,
"Main.height":1102.63,
"Main.savepath":"I://yuwuN3102mseed//post",
"Main.push2wx":"NO",
"Main.push_url":"http://www.txgy.cloud/api/index/push",
"Main.push_mag":-1.0,
"Main.message_id":1,
"Main.company_id":1,
"Main.area_id":8,
"Main.content":"通知事件",
"Main.push_key":"Y3qYFBQPMbfTt6m",
"RServer.host":"127.0.0.1",
"channels":[
{"network":"HA","station":"N02,N03,N04,N05,N06,N07,N08,N09,N10,N11,N12,N13,N14,N15,N16,N17,N18,N19,N20,N21,N22,N23,N24,N25,N26,N27","location":"06","channels":"SHZ:SHN:SHE"}
], ],
"Locate.log_level" : "DEBUG", "Main.log_level": "DEBUG",
"Locate.work_path" :".", "Main.slice_seconds": 30,
"Locate.xmin":38396517, "Main.overlap_seconds": 10,
"Locate.xmax":38398317, "Main.is_mag": "YES",
"Locate.ymin":4029418, "Main.is_write_slice": "NO",
"Locate.ymax":4031218, "Main.lon": 38398463.49,
"Locate.zref":1039, "Main.lat": 4031112.103,
"Locate.zmin":300, "Main.height": 1102.63,
"Locate.zmax":800, "Main.savepath": "I:/DATA/workarea/n2017/Post",
"Locate.minstep":10, "Main.push2wx": "NO",
"Locate.method":"", "Main.push_url": "http://www.txgy.cloud/api/index/push",
"Locate.clusted_otime":0.5 "Main.push_mag": -1.0,
"Main.message_id": 1,
"Main.company_id": 1,
"Main.area_id": 8,
"Main.content": "通知事件",
"Main.push_key": "Y3qYFBQPMbfTt6m",
"RServer.host": "127.0.0.1",
"channels": [
{
"network": "HA",
"location": "06",
"channels": "SHZ:SHN:SHE",
"station": "N02,N06,N19,N09,N13,N14,N15,N16,N18,N20,N22,N24,N11,N26,N05,N27,N23,N10"
}
],
"Locate.log_level": "DEBUG",
"Locate.work_path": ".",
"Locate.xmin": 38400000.0,
"Locate.xmax": 38401600.0,
"Locate.ymin": 4030400.0,
"Locate.ymax": 4032000.0,
"Locate.zref": 1039.0,
"Locate.zmin": 300.0,
"Locate.zmax": 800.0,
"Locate.minstep": 10.0,
"Locate.method": "",
"Locate.clusted_otime": 0.5
} }
Write Preview
Loading…
Cancel
Save