Skip to content

H
hemei
Commit 8b73bece authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

1. 报警系统支持数据库

parent 81ff36f4
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 172 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
View file @ 8b73bece
......@@ -91,26 +91,26 @@
</Compile>
<Compile Include="BlowingDetectCore.cs" />
<Compile Include="CalFilmLen.cs" />
<Compile Include="Page_Blowing.xaml.cs">
<DependentUpon>Page_Blowing.xaml</DependentUpon>
<Compile Include="PgBlowing.xaml.cs">
<DependentUpon>PgBlowing.xaml</DependentUpon>
</Compile>
<Compile Include="Page_Custom.xaml.cs">
<DependentUpon>Page_Custom.xaml</DependentUpon>
<Compile Include="PgCustom.xaml.cs">
<DependentUpon>PgCustom.xaml</DependentUpon>
</Compile>
<Compile Include="Page_ErrorTable.xaml.cs">
<DependentUpon>Page_ErrorTable.xaml</DependentUpon>
<Compile Include="PgErrorTable.xaml.cs">
<DependentUpon>PgErrorTable.xaml</DependentUpon>
</Compile>
<Compile Include="Page_Main.xaml.cs">
<DependentUpon>Page_Main.xaml</DependentUpon>
<Compile Include="PgMain.xaml.cs">
<DependentUpon>PgMain.xaml</DependentUpon>
</Compile>
<Compile Include="Page_Menu.xaml.cs">
<DependentUpon>Page_Menu.xaml</DependentUpon>
<Compile Include="PgMenu.xaml.cs">
<DependentUpon>PgMenu.xaml</DependentUpon>
</Compile>
<Compile Include="Page_ProfileBlowing.xaml.cs">
<DependentUpon>Page_ProfileBlowing.xaml</DependentUpon>
<Compile Include="PgProfileBlowing.xaml.cs">
<DependentUpon>PgProfileBlowing.xaml</DependentUpon>
</Compile>
<Compile Include="Page_ScanWarning.xaml.cs">
<DependentUpon>Page_ScanWarning.xaml</DependentUpon>
<Compile Include="PgScanWarning.xaml.cs">
<DependentUpon>PgScanWarning.xaml</DependentUpon>
</Compile>
<Compile Include="PgBlowingExt.xaml.cs">
<DependentUpon>PgBlowingExt.xaml</DependentUpon>
......@@ -148,11 +148,11 @@
<Compile Include="UIModule\ScanGraphCircular\ScanGraphCircularConfig.xaml.cs">
<DependentUpon>ScanGraphCircularConfig.xaml</DependentUpon>
</Compile>
<Compile Include="Window_IOTip.xaml.cs">
<DependentUpon>Window_IOTip.xaml</DependentUpon>
<Compile Include="WdIOTip.xaml.cs">
<DependentUpon>WdIOTip.xaml</DependentUpon>
</Compile>
<Compile Include="Window_ProfileLegend.xaml.cs">
<DependentUpon>Window_ProfileLegend.xaml</DependentUpon>
<Compile Include="WdProfileLegend.xaml.cs">
<DependentUpon>WdProfileLegend.xaml</DependentUpon>
</Compile>
<Page Include="Culture\StringResource.en-US.xaml">
<SubType>Designer</SubType>
......@@ -162,23 +162,23 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page_Blowing.xaml">
<Page Include="PgBlowing.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page_Custom.xaml">
<Page Include="PgCustom.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page_ErrorTable.xaml">
<Page Include="PgErrorTable.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page_Main.xaml">
<Page Include="PgMain.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page_Menu.xaml">
<Page Include="PgMenu.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
......@@ -186,11 +186,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page_ProfileBlowing.xaml">
<Page Include="PgProfileBlowing.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page_ScanWarning.xaml">
<Page Include="PgScanWarning.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -230,11 +230,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Window_IOTip.xaml">
<Page Include="WdIOTip.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Window_ProfileLegend.xaml">
<Page Include="WdProfileLegend.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/MainWindow.xaml.cs
View file @ 8b73bece
......@@ -61,7 +61,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
}
LoadingProgress lp;
Page_Main pMain;
PgMain pMain;
void Init()
{
System.Windows.Application.Current.Dispatcher.Invoke(new Action(() =>
......@@ -115,7 +115,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
System.Windows.Application.Current.Dispatcher.Invoke(new Action(() =>
{
pMain = new Page_Main();
pMain = new PgMain();
lp.Progress += 10;
}));
System.Threading.Thread.Sleep(10);
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Blowing.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgBlowing.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_Blowing"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgBlowing"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Blowing.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgBlowing.xaml.cs
View file @ 8b73bece
......@@ -26,11 +26,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_Blowing.xaml 的交互逻辑
/// </summary>
public partial class Page_Blowing : Page
public partial class PgBlowing : Page
{
PgBlowingViewModel viewModel;
public Page_Blowing()
public PgBlowing()
{
InitializeComponent();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Custom.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgCustom.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_Custom"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgCustom"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Custom.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgCustom.xaml.cs
View file @ 8b73bece
......@@ -22,11 +22,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_Custom.xaml 的交互逻辑
/// </summary>
public partial class Page_Custom : Page
public partial class PgCustom : Page
{
SysParam msysparam;
TDGage gage;
public Page_Custom()
public PgCustom()
{
InitializeComponent();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ErrorTable.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_ErrorTable"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgErrorTable"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ErrorTable.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml.cs
View file @ 8b73bece
......@@ -18,13 +18,13 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_ErrorTable.xaml 的交互逻辑
/// </summary>
public partial class Page_ErrorTable : Page
public partial class PgErrorTable : Page
{
FLY.OBJComponents.Client.WarningServiceClient mWarningService;
FLY.OBJComponents.Client.BufferWindow<FLY.OBJComponents.Common.FlyData_WarningHistory> mWindow;
TDGage gage;
public Page_ErrorTable()
public PgErrorTable()
{
InitializeComponent();
Init();
......@@ -54,7 +54,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void button_iotip_click(object sender, RoutedEventArgs e)
{
Window_IOTip w = new Window_IOTip();
WdIOTip w = new WdIOTip();
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Main.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgMain.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_Main"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgMain"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Main.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgMain.xaml.cs
View file @ 8b73bece
......@@ -28,13 +28,13 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_Main.xaml 的交互逻辑
/// </summary>
public partial class Page_Main : Page
public partial class PgMain : Page
{
private ThickTcpUiInWindow.UIModule.FLYLayout mLayout;
private FLYLayoutManager mManager;
TDGage gage;
public Page_Main()
public PgMain()
{
InitializeComponent();
......@@ -200,14 +200,14 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
}
private void button_menu_click(object sender, RoutedEventArgs e)
{
Page_Menu p = new Page_Menu();
PgMenu p = new PgMenu();
p.Init(gage);
NavigationService.Navigate(p);
}
private void button_profile_click(object sender, RoutedEventArgs e)
{
Page_ProfileBlowing p = new Page_ProfileBlowing();
PgProfileBlowing p = new PgProfileBlowing();
p.Init(gage.mSysParam.ServerIPEP);
NavigationService.Navigate(p);
......@@ -220,7 +220,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void Border_Blowing_Click(object sender, RoutedEventArgs e)
{
Page_Blowing p = new Page_Blowing();
PgBlowing p = new PgBlowing();
p.Init(gage.mSysParam.ServerIPEP);
NavigationService.Navigate(p);
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Menu.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgMenu.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_Menu"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgMenu"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......@@ -15,7 +15,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
<misc:Ver x:Key="version" SrcType="{x:Type local:Page_Menu}"/>
<misc:Ver x:Key="version" SrcType="{x:Type local:PgMenu}"/>
</ResourceDictionary>
</Page.Resources>
<Grid >
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Menu.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgMenu.xaml.cs
View file @ 8b73bece
......@@ -18,10 +18,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_Menu.xaml 的交互逻辑
/// </summary>
public partial class Page_Menu : Page
public partial class PgMenu : Page
{
TDGage gage;
public Page_Menu()
public PgMenu()
{
InitializeComponent();
}
......@@ -33,7 +33,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void button_custom_Click(object sender, RoutedEventArgs e)
{
Page_Custom p = new Page_Custom();
PgCustom p = new PgCustom();
p.Init(gage);
NavigationService.Navigate(p);
}
......@@ -51,7 +51,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void button_warning_Click(object sender, RoutedEventArgs e)
{
Page_ErrorTable p = new Page_ErrorTable();
PgErrorTable p = new PgErrorTable();
p.Init();
NavigationService.Navigate(p);
}
......@@ -90,14 +90,14 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void button_blowing_Click(object sender, RoutedEventArgs e)
{
Page_Blowing p = new Page_Blowing();
PgBlowing p = new PgBlowing();
p.Init(gage.mSysParam.ServerIPEP);
NavigationService.Navigate(p);
}
private void button_scanwarning_Click(object sender, RoutedEventArgs e)
{
Page_ScanWarning p = new Page_ScanWarning();
PgScanWarning p = new PgScanWarning();
p.Init(gage.mSysParam.ServerIPEP);
NavigationService.Navigate(p);
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ProfileBlowing.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgProfileBlowing.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_ProfileBlowing"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgProfileBlowing"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ProfileBlowing.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgProfileBlowing.xaml.cs
View file @ 8b73bece
......@@ -28,12 +28,12 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_ProfileBlowing.xaml 的交互逻辑
/// </summary>
public partial class Page_ProfileBlowing : Page, INotifyPropertyChanged
public partial class PgProfileBlowing : Page, INotifyPropertyChanged
{
public ObservableCollection<string> mList = new ObservableCollection<string>();
public BlowingFixProfileServiceClient mProfile = null;
public Page_ProfileBlowing()
public PgProfileBlowing()
{
InitializeComponent();
}
......@@ -209,7 +209,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void button_legend_Click(object sender, RoutedEventArgs e)
{
Window_ProfileLegend w = new Window_ProfileLegend();
WdProfileLegend w = new WdProfileLegend();
w.DataContext = mProfile.Param;
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ScanWarning.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgScanWarning.xaml
View file @ 8b73bece
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.Page_ScanWarning"
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.PgScanWarning"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ScanWarning.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgScanWarning.xaml.cs
View file @ 8b73bece
......@@ -20,11 +20,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Page_ScanWarning.xaml 的交互逻辑
/// </summary>
public partial class Page_ScanWarning : Page
public partial class PgScanWarning : Page
{
ScanWarningServiceClient mScanWarning;
public Page_ScanWarning()
public PgScanWarning()
{
InitializeComponent();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/DynAreaIO.xaml.cs
View file @ 8b73bece
......@@ -48,7 +48,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UIModule
// w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
// w.ShowDialog();
//}
Page_ErrorTable p = new Page_ErrorTable();
PgErrorTable p = new PgErrorTable();
p.Init();
(Application.Current.Properties["NavigationService"] as NavigationService).Navigate(p);
......@@ -262,7 +262,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UIModule
public DynAreaIOParams()
{
IODespWindowType = typeof(Window_IOTip);
IODespWindowType = typeof(WdIOTip);
}
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_IOTip.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/WdIOTip.xaml
View file @ 8b73bece
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.Window_IOTip"
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.WdIOTip"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_IOTip.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/WdIOTip.xaml.cs
View file @ 8b73bece
......@@ -16,9 +16,9 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Window_IOTip.xaml 的交互逻辑
/// </summary>
public partial class Window_IOTip : FLY.ControlLibrary.WindowBigClose
public partial class WdIOTip : FLY.ControlLibrary.WindowBigClose
{
public Window_IOTip()
public WdIOTip()
{
InitializeComponent();
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_ProfileLegend.xaml → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/WdProfileLegend.xaml
View file @ 8b73bece
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.Window_ProfileLegend"
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.WdProfileLegend"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_ProfileLegend.xaml.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/WdProfileLegend.xaml.cs
View file @ 8b73bece
......@@ -16,9 +16,9 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// <summary>
/// Window_ProfileLegend.xaml 的交互逻辑
/// </summary>
public partial class Window_ProfileLegend : FLY.ControlLibrary.WindowBigClose
public partial class WdProfileLegend : FLY.ControlLibrary.WindowBigClose
{
public Window_ProfileLegend()
public WdProfileLegend()
{
InitializeComponent();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/Model/DBModel.cs
View file @ 8b73bece
using SQLite;
using FLY.OBJComponents.Server.Model;
using SQLite;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -7,7 +8,7 @@ using System.Threading.Tasks;
namespace FLY.Thick.Blowing.Server.Model
{
public class DBModel:SQLiteDbContext
public class DBModel:SQLiteDbContext,IErrorDBModel
{
public DBTable<DB_Profile> TbProfile { get; } = new DBTable<DB_Profile>();
public DBTable<DB_ScanData> TbScanData { get; } = new DBTable<DB_ScanData>();
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/Model/DBTable.cs
View file @ 8b73bece
......@@ -153,45 +153,5 @@ namespace FLY.Thick.Blowing.Server.Model
public string Boltmap { get; set; }
}
/// <summary>
/// 异常记录
/// </summary>
[Table("Error")]
public class DB_Error
{
[Key]
[PropertyIndex(0)]
public Int64 ID { get; set; }
/// <summary>
/// 发生的时间
/// </summary>
[PropertyIndex(1)]
public DateTime Time { get; set; }
/// <summary>
/// 异常代码
/// </summary>
[PropertyIndex(2)]
public int ErrCode { get; set; }
/// <summary>
/// true=异常是发生了,false=异常关闭
/// </summary>
[PropertyIndex(3)]
public bool IsOn { get; set; }
/// <summary>
/// 异常描述
/// </summary>
[PropertyIndex(4)]
public string Descrption { get; set; }
/// <summary>
/// 其它附加信息,json
/// </summary>
[PropertyIndex(5)]
public string Accessory { get; set; }
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/Model/HistoryDB.cs
View file @ 8b73bece

using FLY.OBJComponents.Server.Model;
using FLY.Thick.Blowing.IService;
using FLY.Thick.Blowing.IService.IShareDBServicePack;
using FObjBase;
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/ScanWarning.cs
View file @ 8b73bece
......@@ -144,43 +144,44 @@ namespace FLY.Thick.Blowing.Server
void GetFrameCB(object AyncContext, object retData)
{
Pack_GetFrameReponse reponse = retData as Pack_GetFrameReponse;
Pack_GetFrameReponse reponse = retData as Pack_GetFrameReponse;
CheckResult result;
if (reponse.Values != null && reponse.Values.Count() > 0)
{
Model.LC_ScanData lc_ScanData = reponse.Values.First();
result = Check(lc_ScanData.Thicks);
}
else
{
result = CheckResult.Idle;
}
CheckResult result;
string accessory = "";
switch (result)
{
case CheckResult.ToleranceWarning:
//报警
if (reponse.Values != null && reponse.Values.Count() > 0)
{
Model.LC_ScanData lc_ScanData = reponse.Values.First();
result = Check(lc_ScanData.Thicks);
if(result!= CheckResult.Idle)
accessory = Newtonsoft.Json.JsonConvert.SerializeObject(lc_ScanData.ID);
}
else
{
result = CheckResult.Idle;
}
switch (result)
{
case CheckResult.ToleranceWarning:
//报警
mWarning.Add(
ERRNOs.SCAN_ERRNO_OVERTOL.Code,
ERRNOs.SCAN_ERRNO_OVERTOL.Descrption,
ERR_STATE.ON,
accessory
);
break;
case CheckResult.Idle:
{
//报警解除
mWarning.Add(
ERRNOs.SCAN_ERRNO_OVERTOL.Code,
ERRNOs.SCAN_ERRNO_OVERTOL.Descrption,
ERR_STATE.ON);
break;
case CheckResult.Idle:
{
//报警解除
mWarning.Add(
ERRNOs.SCAN_ERRNO_OVERCTRL.Code,
ERRNOs.SCAN_ERRNO_OVERCTRL.Descrption,
ERR_STATE.OFF);
//报警解除
mWarning.Add(
ERRNOs.SCAN_ERRNO_OVERTOL.Code,
ERRNOs.SCAN_ERRNO_OVERTOL.Descrption,
ERR_STATE.OFF);
}
break;
}
ERR_STATE.OFF);
}
break;
}
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/TDGage.cs
View file @ 8b73bece
......@@ -89,6 +89,9 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
public GM_BlowingFix mGMRenZiJiaFix;
/// <summary>
/// 扫描报警系统
/// </summary>
public ScanWarning mScanWarning;
......@@ -216,19 +219,34 @@ namespace FLY.Thick.Blowing.Server
//---------------------------------------------------------------------------------------------------------------
//Warning_Create
mWarning = new OBJComponents.Server.WarningSystem();
mWarning.RingEvent += () =>
OBJComponents.Server.BufferError bufferError = new OBJComponents.Server.BufferError();
bufferError.Init(mDBModel);
mWarning = new OBJComponents.Server.WarningSystem(bufferError);
Misc.BindingOperations.SetBinding(mWarning, "IsRinging", () =>
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)~Misc.MyBase.BIT(4 - 1));
};
mWarning.ResetEvent += () => {
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)Misc.MyBase.BIT(4 - 1));
};
if (mWarning.IsRinging)
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)~Misc.MyBase.BIT(4 - 1));
}
else
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)Misc.MyBase.BIT(4 - 1));
}
});
//---------------------------------------------------------------------------------------------------------------
//ScanWarning_Create
mScanWarning = new ScanWarning();
mScanWarning.Init(mWarning, mProfile.Param, mBulkDB);
//---------------------------------------------------------------------------------------------------------------
//GM_Fix_Create
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs
View file @ 8b73bece
......@@ -346,18 +346,21 @@ namespace FLY.Thick.BlowingScan.Server
//---------------------------------------------------------------------------------------------------------------
//Warning_Create
mWarning = new OBJComponents.Server.WarningSystem();
mWarning.RingEvent += () =>
Misc.BindingOperations.SetBinding(mWarning, "IsRinging", () =>
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)~Misc.MyBase.BIT(4 - 1));
};
mWarning.ResetEvent += () => {
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)Misc.MyBase.BIT(4 - 1));
};
if (mWarning.IsRinging)
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)~Misc.MyBase.BIT(4 - 1));
}
else
{
mFlyAD.SetOutput(
(UInt16)Misc.MyBase.BIT(4 - 1),
(UInt16)Misc.MyBase.BIT(4 - 1));
}
});
//---------------------------------------------------------------------------------------------------------------
//GM_Fix_Create
mGMFix = new GM_Fix(mFlyAD);
......
Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs
View file @ 8b73bece
......@@ -148,15 +148,16 @@ namespace FLY.Weight.Server
Items[i].AlarmIsOn = !mWarning.Enable;
}
});
mWarning.ResetEvent = () =>//复位事件
Misc.BindingOperations.SetBinding(mWarning, "IsRinging", () =>
{
for (int i = 0; i < ItemsCnt; i++)
if (!mWarning.IsRinging)
{
Items[i].IsAlarmReseted = false;
for (int i = 0; i < ItemsCnt; i++)
{
Items[i].IsAlarmReseted = false;
}
}
};
});
//--------------------------------------------------------------------------------
//流量记录
FlowList = new BufferStorage<FlyData_Flow>("flowlist.csv", 5, FlowListSize);
......
thick_public @ b42aa275
Subproject commit 3afe9982506cd9532f479849c25a711ef82eea0f
Subproject commit b42aa2756c91edc717a67ac8c52906e7f95dff27
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment