diff --git a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj index f3eedfa..0f47b99 100644 --- a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj +++ b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj @@ -37,6 +37,8 @@ + + diff --git a/RFIDSocket/LogControl.cs b/RFIDSocket/LogControl.cs new file mode 100644 index 0000000..368cd72 --- /dev/null +++ b/RFIDSocket/LogControl.cs @@ -0,0 +1,33 @@ +using HighWayIot.Repository.domain; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RFIDSocket +{ + public class LogControl + { + public static List LogContentSelect(List lists, string content) + { + return lists.Where(x => x.Content.Contains(content)).ToList(); + } + + public static List LogReadKindSelect(List lists, string readKind) + { + return lists.Where(x => x.ReadKind == readKind).ToList(); + } + + public static List LogDeviceNoSelect(List lists, int deviceNo) + { + return lists.Where(x => x.DeviceNo == deviceNo).ToList(); + } + + public static List LogTimeSelect(List lists, DateTime start, DateTime end) + { + return lists.Where(x => x.LogTime >= start && x.LogTime <= end).ToList(); + } + } +} diff --git a/RFIDSocket/RFIDLog.Designer.cs b/RFIDSocket/RFIDLog.Designer.cs new file mode 100644 index 0000000..3d4b776 --- /dev/null +++ b/RFIDSocket/RFIDLog.Designer.cs @@ -0,0 +1,293 @@ +namespace RFIDSocket +{ + partial class RFIDLog + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.TimeSelect = new System.Windows.Forms.Button(); + this.StartTime = new System.Windows.Forms.DateTimePicker(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.EndTime = new System.Windows.Forms.DateTimePicker(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.ReadKind = new System.Windows.Forms.ComboBox(); + this.ReadKindSelect = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.DeviceNo = new System.Windows.Forms.TextBox(); + this.DeviceNoSelect = new System.Windows.Forms.Button(); + this.LogContent = new System.Windows.Forms.DataGridView(); + this.deviceNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.readKindDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.contentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.Content = new System.Windows.Forms.TextBox(); + this.ContentSelect = new System.Windows.Forms.Button(); + this.SelectAll = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.LogContent)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); + this.groupBox4.SuspendLayout(); + this.SuspendLayout(); + // + // TimeSelect + // + this.TimeSelect.Location = new System.Drawing.Point(42, 76); + this.TimeSelect.Name = "TimeSelect"; + this.TimeSelect.Size = new System.Drawing.Size(122, 48); + this.TimeSelect.TabIndex = 0; + this.TimeSelect.Text = "时间范围查询"; + this.TimeSelect.UseVisualStyleBackColor = true; + this.TimeSelect.Click += new System.EventHandler(this.TimeSelect_Click); + // + // StartTime + // + this.StartTime.CustomFormat = "yyyy-MM-dd hh:mm:ss"; + this.StartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.StartTime.Location = new System.Drawing.Point(25, 20); + this.StartTime.Name = "StartTime"; + this.StartTime.Size = new System.Drawing.Size(158, 21); + this.StartTime.TabIndex = 1; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.EndTime); + this.groupBox1.Controls.Add(this.StartTime); + this.groupBox1.Controls.Add(this.TimeSelect); + this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(208, 131); + this.groupBox1.TabIndex = 2; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "按日期时间查询"; + // + // EndTime + // + this.EndTime.CustomFormat = "yyyy-MM-dd hh:mm:ss"; + this.EndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.EndTime.Location = new System.Drawing.Point(25, 49); + this.EndTime.Name = "EndTime"; + this.EndTime.Size = new System.Drawing.Size(158, 21); + this.EndTime.TabIndex = 2; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.ReadKind); + this.groupBox2.Controls.Add(this.ReadKindSelect); + this.groupBox2.Location = new System.Drawing.Point(12, 149); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(208, 131); + this.groupBox2.TabIndex = 5; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "读码结果查询"; + // + // ReadKind + // + this.ReadKind.FormattingEnabled = true; + this.ReadKind.Location = new System.Drawing.Point(42, 30); + this.ReadKind.Name = "ReadKind"; + this.ReadKind.Size = new System.Drawing.Size(122, 20); + this.ReadKind.TabIndex = 1; + this.ReadKind.Text = " "; + // + // ReadKindSelect + // + this.ReadKindSelect.Location = new System.Drawing.Point(42, 65); + this.ReadKindSelect.Name = "ReadKindSelect"; + this.ReadKindSelect.Size = new System.Drawing.Size(122, 48); + this.ReadKindSelect.TabIndex = 0; + this.ReadKindSelect.Text = "读码结果查询"; + this.ReadKindSelect.UseVisualStyleBackColor = true; + this.ReadKindSelect.Click += new System.EventHandler(this.ReadKindSelect_Click); + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.DeviceNo); + this.groupBox3.Controls.Add(this.DeviceNoSelect); + this.groupBox3.Location = new System.Drawing.Point(12, 286); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(208, 131); + this.groupBox3.TabIndex = 6; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "设备编号查询"; + // + // DeviceNo + // + this.DeviceNo.Location = new System.Drawing.Point(42, 29); + this.DeviceNo.Name = "DeviceNo"; + this.DeviceNo.Size = new System.Drawing.Size(122, 21); + this.DeviceNo.TabIndex = 1; + // + // DeviceNoSelect + // + this.DeviceNoSelect.Location = new System.Drawing.Point(42, 65); + this.DeviceNoSelect.Name = "DeviceNoSelect"; + this.DeviceNoSelect.Size = new System.Drawing.Size(122, 48); + this.DeviceNoSelect.TabIndex = 0; + this.DeviceNoSelect.Text = "设备编号查询"; + this.DeviceNoSelect.UseVisualStyleBackColor = true; + this.DeviceNoSelect.Click += new System.EventHandler(this.DeviceNoSelect_Click); + // + // LogContent + // + this.LogContent.AutoGenerateColumns = false; + this.LogContent.ColumnHeadersHeight = 20; + this.LogContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.deviceNoDataGridViewTextBoxColumn, + this.readKindDataGridViewTextBoxColumn, + this.contentDataGridViewTextBoxColumn, + this.logTimeDataGridViewTextBoxColumn}); + this.LogContent.DataSource = this.rFIDContentBindingSource; + this.LogContent.Location = new System.Drawing.Point(226, 12); + this.LogContent.Name = "LogContent"; + this.LogContent.RowHeadersVisible = false; + this.LogContent.RowTemplate.Height = 18; + this.LogContent.Size = new System.Drawing.Size(500, 899); + this.LogContent.TabIndex = 7; + // + // deviceNoDataGridViewTextBoxColumn + // + this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn.HeaderText = "编号"; + this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn"; + this.deviceNoDataGridViewTextBoxColumn.Width = 40; + // + // readKindDataGridViewTextBoxColumn + // + this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind"; + this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果"; + this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn"; + this.readKindDataGridViewTextBoxColumn.Width = 60; + // + // contentDataGridViewTextBoxColumn + // + this.contentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.contentDataGridViewTextBoxColumn.DataPropertyName = "Content"; + this.contentDataGridViewTextBoxColumn.HeaderText = "条码内容"; + this.contentDataGridViewTextBoxColumn.Name = "contentDataGridViewTextBoxColumn"; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "日志时间"; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.Width = 105; + // + // rFIDContentBindingSource + // + this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.Content); + this.groupBox4.Controls.Add(this.ContentSelect); + this.groupBox4.Location = new System.Drawing.Point(12, 423); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(208, 131); + this.groupBox4.TabIndex = 7; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "条码内容查询"; + // + // Content + // + this.Content.Location = new System.Drawing.Point(42, 29); + this.Content.Name = "Content"; + this.Content.Size = new System.Drawing.Size(122, 21); + this.Content.TabIndex = 1; + // + // ContentSelect + // + this.ContentSelect.Location = new System.Drawing.Point(42, 65); + this.ContentSelect.Name = "ContentSelect"; + this.ContentSelect.Size = new System.Drawing.Size(122, 48); + this.ContentSelect.TabIndex = 0; + this.ContentSelect.Text = "条码内容查询"; + this.ContentSelect.UseVisualStyleBackColor = true; + this.ContentSelect.Click += new System.EventHandler(this.ContentSelect_Click); + // + // SelectAll + // + this.SelectAll.Location = new System.Drawing.Point(12, 560); + this.SelectAll.Name = "SelectAll"; + this.SelectAll.Size = new System.Drawing.Size(208, 48); + this.SelectAll.TabIndex = 2; + this.SelectAll.Text = "综合条件查询"; + this.SelectAll.UseVisualStyleBackColor = true; + this.SelectAll.Click += new System.EventHandler(this.SelectAll_Click); + // + // RFIDLog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(738, 923); + this.Controls.Add(this.SelectAll); + this.Controls.Add(this.groupBox4); + this.Controls.Add(this.LogContent); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Name = "RFIDLog"; + this.Text = "日志查询"; + this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.LogContent)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button TimeSelect; + private System.Windows.Forms.DateTimePicker StartTime; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.DateTimePicker EndTime; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.ComboBox ReadKind; + private System.Windows.Forms.Button ReadKindSelect; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.TextBox DeviceNo; + private System.Windows.Forms.Button DeviceNoSelect; + private System.Windows.Forms.DataGridView LogContent; + private System.Windows.Forms.BindingSource rFIDContentBindingSource; + private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn readKindDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn contentDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.TextBox Content; + private System.Windows.Forms.Button ContentSelect; + private System.Windows.Forms.Button SelectAll; + } +} \ No newline at end of file diff --git a/RFIDSocket/RFIDLog.cs b/RFIDSocket/RFIDLog.cs new file mode 100644 index 0000000..c80f6bb --- /dev/null +++ b/RFIDSocket/RFIDLog.cs @@ -0,0 +1,104 @@ +using HighWayIot.Repository.domain; +using HighWayIot.Repository.service.Impl; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace RFIDSocket +{ + public partial class RFIDLog : Form + { + + List rFIDContents = new List(); + BaseContentServiceImpl sql = new BaseContentServiceImpl(); + public RFIDLog() + { + InitializeComponent(); + StartTime.Value = DateTime.Now.AddDays(-3); + List list = new List + { + "", + "NB", + "GR", + "MR" + }; + ReadKind.DataSource = list; + Init(); + } + + private void Init() + { + rFIDContents = sql.GetContentInfos(); + } + + private void TimeSelect_Click(object sender, EventArgs e) + { + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = LogControl.LogTimeSelect(rFIDContents, StartTime.Value, EndTime.Value); + } + } + + private void ReadKindSelect_Click(object sender, EventArgs e) + { + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = LogControl.LogReadKindSelect(rFIDContents, ReadKind.Text); + } + } + + private void DeviceNoSelect_Click(object sender, EventArgs e) + { + if(!int.TryParse(DeviceNo.Text, out int no)) + { + MessageBox.Show("设备编号格式不正确"); + return; + } + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = LogControl.LogDeviceNoSelect(rFIDContents, no); + } + } + + private void ContentSelect_Click(object sender, EventArgs e) + { + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = LogControl.LogContentSelect(rFIDContents, Content.Text); + } + } + + private void SelectAll_Click(object sender, EventArgs e) + { + if (!int.TryParse(DeviceNo.Text, out int no)) + { + MessageBox.Show("设备编号格式不正确"); + return; + } + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = LogControl.LogTimeSelect( + LogControl.LogReadKindSelect( + LogControl.LogDeviceNoSelect( + LogControl.LogContentSelect(rFIDContents, + Content.Text), + no), + ReadKind.Text), + StartTime.Value, EndTime.Value); + } + } + } + + +} diff --git a/RFIDSocket/RFIDLog.resx b/RFIDSocket/RFIDLog.resx new file mode 100644 index 0000000..3e42c4d --- /dev/null +++ b/RFIDSocket/RFIDLog.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 17, 17 + + \ No newline at end of file diff --git a/RFIDSocket/RFIDSocket.Designer.cs b/RFIDSocket/RFIDSocket.Designer.cs index 0f2c605..6375169 100644 --- a/RFIDSocket/RFIDSocket.Designer.cs +++ b/RFIDSocket/RFIDSocket.Designer.cs @@ -30,12 +30,6 @@ { this.components = new System.ComponentModel.Container(); this.CotentData = new System.Windows.Forms.DataGridView(); - this.deviceNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.readKindDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.contentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); this.IPText = new System.Windows.Forms.TextBox(); this.SetAddress = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); @@ -46,26 +40,32 @@ this.TableTimer = new System.Windows.Forms.Timer(this.components); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.StateData = new System.Windows.Forms.DataGridView(); - this.deviceNoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.LogTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rFIDStateBindingSource = new System.Windows.Forms.BindingSource(this.components); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.HeartbeatData = new System.Windows.Forms.DataGridView(); - this.deviceNoDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.timeSpanDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.rFIDHeartbeatBindingSource = new System.Windows.Forms.BindingSource(this.components); this.PgUp = new System.Windows.Forms.Button(); this.PgDn = new System.Windows.Forms.Button(); this.PageRange = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); + this.LogStart = new System.Windows.Forms.Button(); + this.deviceNoDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.timeSpanDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDHeartbeatBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.deviceNoDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.rFIDStateBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.deviceNoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.readKindDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.contentDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.StateData)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); this.SuspendLayout(); // // CotentData @@ -76,8 +76,7 @@ this.deviceNoDataGridViewTextBoxColumn, this.readKindDataGridViewTextBoxColumn, this.contentDataGridViewTextBoxColumn, - this.logTimeDataGridViewTextBoxColumn, - this.ID}); + this.logTimeDataGridViewTextBoxColumn}); this.CotentData.DataSource = this.rFIDContentBindingSource; this.CotentData.Location = new System.Drawing.Point(9, 103); this.CotentData.Margin = new System.Windows.Forms.Padding(2); @@ -89,50 +88,6 @@ this.CotentData.Size = new System.Drawing.Size(486, 870); this.CotentData.TabIndex = 0; // - // deviceNoDataGridViewTextBoxColumn - // - this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo"; - this.deviceNoDataGridViewTextBoxColumn.HeaderText = "编号"; - this.deviceNoDataGridViewTextBoxColumn.MinimumWidth = 6; - this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn"; - this.deviceNoDataGridViewTextBoxColumn.Width = 40; - // - // readKindDataGridViewTextBoxColumn - // - this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind"; - this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果"; - this.readKindDataGridViewTextBoxColumn.MinimumWidth = 6; - this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn"; - this.readKindDataGridViewTextBoxColumn.Width = 60; - // - // contentDataGridViewTextBoxColumn - // - this.contentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.contentDataGridViewTextBoxColumn.DataPropertyName = "Content"; - this.contentDataGridViewTextBoxColumn.HeaderText = "条码内容"; - this.contentDataGridViewTextBoxColumn.MinimumWidth = 6; - this.contentDataGridViewTextBoxColumn.Name = "contentDataGridViewTextBoxColumn"; - // - // logTimeDataGridViewTextBoxColumn - // - this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; - this.logTimeDataGridViewTextBoxColumn.HeaderText = "读取时间"; - this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; - this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; - this.logTimeDataGridViewTextBoxColumn.Width = 105; - // - // ID - // - this.ID.DataPropertyName = "ID"; - this.ID.HeaderText = "ID"; - this.ID.MinimumWidth = 6; - this.ID.Name = "ID"; - this.ID.Width = 125; - // - // rFIDContentBindingSource - // - this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); - // // IPText // this.IPText.Location = new System.Drawing.Point(116, 23); @@ -176,7 +131,7 @@ // // MonitorOnOff // - this.MonitorOnOff.Location = new System.Drawing.Point(421, 11); + this.MonitorOnOff.Location = new System.Drawing.Point(391, 11); this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(2); this.MonitorOnOff.Name = "MonitorOnOff"; this.MonitorOnOff.Size = new System.Drawing.Size(110, 45); @@ -188,7 +143,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(569, 27); + this.label4.Location = new System.Drawing.Point(505, 27); this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(65, 12); @@ -199,7 +154,7 @@ // this.MonitorState.AutoSize = true; this.MonitorState.BackColor = System.Drawing.Color.Transparent; - this.MonitorState.Location = new System.Drawing.Point(638, 27); + this.MonitorState.Location = new System.Drawing.Point(574, 27); this.MonitorState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.MonitorState.Name = "MonitorState"; this.MonitorState.Size = new System.Drawing.Size(17, 12); @@ -240,14 +195,6 @@ this.StateData.Size = new System.Drawing.Size(177, 425); this.StateData.TabIndex = 0; // - // deviceNoDataGridViewTextBoxColumn1 - // - this.deviceNoDataGridViewTextBoxColumn1.DataPropertyName = "DeviceNo"; - this.deviceNoDataGridViewTextBoxColumn1.HeaderText = "编号"; - this.deviceNoDataGridViewTextBoxColumn1.MinimumWidth = 6; - this.deviceNoDataGridViewTextBoxColumn1.Name = "deviceNoDataGridViewTextBoxColumn1"; - this.deviceNoDataGridViewTextBoxColumn1.Width = 60; - // // LogTime // this.LogTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; @@ -256,10 +203,6 @@ this.LogTime.MinimumWidth = 6; this.LogTime.Name = "LogTime"; // - // rFIDStateBindingSource - // - this.rFIDStateBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDState); - // // groupBox3 // this.groupBox3.Controls.Add(this.HeartbeatData); @@ -290,26 +233,6 @@ this.HeartbeatData.Size = new System.Drawing.Size(177, 437); this.HeartbeatData.TabIndex = 0; // - // deviceNoDataGridViewTextBoxColumn2 - // - this.deviceNoDataGridViewTextBoxColumn2.DataPropertyName = "DeviceNo"; - this.deviceNoDataGridViewTextBoxColumn2.HeaderText = "编号"; - this.deviceNoDataGridViewTextBoxColumn2.MinimumWidth = 6; - this.deviceNoDataGridViewTextBoxColumn2.Name = "deviceNoDataGridViewTextBoxColumn2"; - this.deviceNoDataGridViewTextBoxColumn2.Width = 60; - // - // timeSpanDataGridViewTextBoxColumn - // - this.timeSpanDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.timeSpanDataGridViewTextBoxColumn.DataPropertyName = "TimeSpan"; - this.timeSpanDataGridViewTextBoxColumn.HeaderText = "距上一次心跳时间"; - this.timeSpanDataGridViewTextBoxColumn.MinimumWidth = 6; - this.timeSpanDataGridViewTextBoxColumn.Name = "timeSpanDataGridViewTextBoxColumn"; - // - // rFIDHeartbeatBindingSource - // - this.rFIDHeartbeatBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDHeartbeat); - // // PgUp // this.PgUp.Location = new System.Drawing.Point(9, 59); @@ -355,11 +278,91 @@ this.label3.TabIndex = 14; this.label3.Text = "显示条数："; // + // LogStart + // + this.LogStart.Location = new System.Drawing.Point(595, 11); + this.LogStart.Margin = new System.Windows.Forms.Padding(2); + this.LogStart.Name = "LogStart"; + this.LogStart.Size = new System.Drawing.Size(85, 45); + this.LogStart.TabIndex = 16; + this.LogStart.Text = "日志查询"; + this.LogStart.UseVisualStyleBackColor = true; + this.LogStart.Click += new System.EventHandler(this.LogStart_Click); + // + // deviceNoDataGridViewTextBoxColumn2 + // + this.deviceNoDataGridViewTextBoxColumn2.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn2.HeaderText = "编号"; + this.deviceNoDataGridViewTextBoxColumn2.MinimumWidth = 6; + this.deviceNoDataGridViewTextBoxColumn2.Name = "deviceNoDataGridViewTextBoxColumn2"; + this.deviceNoDataGridViewTextBoxColumn2.Width = 60; + // + // timeSpanDataGridViewTextBoxColumn + // + this.timeSpanDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.timeSpanDataGridViewTextBoxColumn.DataPropertyName = "TimeSpan"; + this.timeSpanDataGridViewTextBoxColumn.HeaderText = "距上一次心跳时间"; + this.timeSpanDataGridViewTextBoxColumn.MinimumWidth = 6; + this.timeSpanDataGridViewTextBoxColumn.Name = "timeSpanDataGridViewTextBoxColumn"; + // + // rFIDHeartbeatBindingSource + // + this.rFIDHeartbeatBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDHeartbeat); + // + // deviceNoDataGridViewTextBoxColumn1 + // + this.deviceNoDataGridViewTextBoxColumn1.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn1.HeaderText = "编号"; + this.deviceNoDataGridViewTextBoxColumn1.MinimumWidth = 6; + this.deviceNoDataGridViewTextBoxColumn1.Name = "deviceNoDataGridViewTextBoxColumn1"; + this.deviceNoDataGridViewTextBoxColumn1.Width = 60; + // + // rFIDStateBindingSource + // + this.rFIDStateBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDState); + // + // rFIDContentBindingSource + // + this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); + // + // deviceNoDataGridViewTextBoxColumn + // + this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn.HeaderText = "编号"; + this.deviceNoDataGridViewTextBoxColumn.MinimumWidth = 6; + this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn"; + this.deviceNoDataGridViewTextBoxColumn.Width = 40; + // + // readKindDataGridViewTextBoxColumn + // + this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind"; + this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果"; + this.readKindDataGridViewTextBoxColumn.MinimumWidth = 6; + this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn"; + this.readKindDataGridViewTextBoxColumn.Width = 60; + // + // contentDataGridViewTextBoxColumn + // + this.contentDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.contentDataGridViewTextBoxColumn.DataPropertyName = "Content"; + this.contentDataGridViewTextBoxColumn.HeaderText = "条码内容"; + this.contentDataGridViewTextBoxColumn.MinimumWidth = 6; + this.contentDataGridViewTextBoxColumn.Name = "contentDataGridViewTextBoxColumn"; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "读取时间"; + this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.Width = 105; + // // RFIDSocket // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(695, 983); + this.Controls.Add(this.LogStart); this.Controls.Add(this.PageRange); this.Controls.Add(this.label3); this.Controls.Add(this.IPText); @@ -376,16 +379,16 @@ this.Controls.Add(this.CotentData); this.Margin = new System.Windows.Forms.Padding(2); this.Name = "RFIDSocket"; - this.Text = " "; + this.Text = " 小件监听"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RFIDSocket_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); this.groupBox2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.StateData)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).EndInit(); this.groupBox3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.HeartbeatData)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rFIDHeartbeatBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -403,10 +406,6 @@ private System.Windows.Forms.Timer TableTimer; private System.Windows.Forms.TextBox IPText; private System.Windows.Forms.BindingSource rFIDContentBindingSource; - private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn readKindDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn contentDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.BindingSource rFIDStateBindingSource; private System.Windows.Forms.GroupBox groupBox3; @@ -417,11 +416,15 @@ private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn timeSpanDataGridViewTextBoxColumn; private System.Windows.Forms.BindingSource rFIDHeartbeatBindingSource; - private System.Windows.Forms.DataGridViewTextBoxColumn ID; private System.Windows.Forms.Button PgUp; private System.Windows.Forms.Button PgDn; private System.Windows.Forms.Label PageRange; private System.Windows.Forms.Label label3; + private System.Windows.Forms.Button LogStart; + private System.Windows.Forms.DataGridViewTextBoxColumn deviceNoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn readKindDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn contentDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; } } diff --git a/RFIDSocket/RFIDSocket.cs b/RFIDSocket/RFIDSocket.cs index 1e4d378..6f2ec5e 100644 --- a/RFIDSocket/RFIDSocket.cs +++ b/RFIDSocket/RFIDSocket.cs @@ -160,5 +160,11 @@ namespace RFIDSocket } PageNo++; } + + private void LogStart_Click(object sender, EventArgs e) + { + RFIDLog rFIDLog = new RFIDLog(); + rFIDLog.Show(); + } } } diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj index aac9914..0183451 100644 --- a/RFIDSocket/RFIDSocket.csproj +++ b/RFIDSocket/RFIDSocket.csproj @@ -56,6 +56,13 @@ + + + Form + + + RFIDLog.cs + Form @@ -73,6 +80,9 @@ True Resources.resx + + RFIDLog.cs + RFIDSocket.cs diff --git a/RFIDSocket/RFIDSocket.resx b/RFIDSocket/RFIDSocket.resx index d331993..452205c 100644 --- a/RFIDSocket/RFIDSocket.resx +++ b/RFIDSocket/RFIDSocket.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - 159, 17 - - - True - 159, 17 @@ -141,13 +132,13 @@ True + + 646, 17 + + + 646, 17 + 413, 17 - - 646, 17 - - - 646, 17 - \ No newline at end of file