From 1be839775a9660897142cafb206ae182c308a29f Mon Sep 17 00:00:00 2001 From: wangsr Date: Mon, 15 Jan 2024 13:29:12 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=97=A5=E5=BF=97=E5=AE=8C=E5=A4=87?= =?UTF-8?q?=20=E6=94=B9=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v17/.suo | Bin 397312 -> 387584 bytes HighWayIot.TouchSocket/RFIDTcpClient.cs | 1 - .../bin/Debug/HighWayIot.TouchSocket.dll | Bin 12288 -> 12288 bytes .../bin/Debug/HighWayIot.TouchSocket.pdb | Bin 42496 -> 42496 bytes .../obj/Debug/HighWayIot.TouchSocket.dll | Bin 12288 -> 12288 bytes .../obj/Debug/HighWayIot.TouchSocket.pdb | Bin 42496 -> 42496 bytes RFIDSocket/LogControl.cs | 90 ++++- RFIDSocket/RFIDLog.Designer.cs | 308 ++++++++++------ RFIDSocket/RFIDLog.cs | 99 ++++- RFIDSocket/RFIDLog.resx | 3 + RFIDSocket/RFIDSocket.Designer.cs | 348 +++++++++--------- RFIDSocket/RFIDSocket.cs | 2 +- RFIDSocket/ServerConnect.cs | 46 ++- 13 files changed, 547 insertions(+), 350 deletions(-) diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index e182b5f4547ac78f87179cbcd71e6bfc68c94290..e8b7740b21d0591766e64c74cbc09667c428e7c0 100644 GIT binary patch delta 11517 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 delta 16643 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 diff --git a/HighWayIot.TouchSocket/RFIDTcpClient.cs b/HighWayIot.TouchSocket/RFIDTcpClient.cs index 9a3b4c8..22c8fc3 100644 --- a/HighWayIot.TouchSocket/RFIDTcpClient.cs +++ b/HighWayIot.TouchSocket/RFIDTcpClient.cs @@ -19,7 +19,6 @@ namespace HighWayIot.TouchSocket public bool State { get => client.Online; - private set => State = value; } global::TouchSocket.Sockets.TcpClient client = new global::TouchSocket.Sockets.TcpClient(); diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll index da0afc9eb39340419ab7d2bf8753be21dade1cea..8a7b6864c8f318955e9d2bd00548dcf407509534 100644 GIT binary patch delta 2595 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 diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb index fa267a30975e8c1a46887eb19059365e2803e5c2..f232bf0df625b1ab106dc4acac4246df15dbb985 100644 GIT binary patch delta 3602 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 MVEU&M@pvNhcag)00RR91 diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll index da0afc9eb39340419ab7d2bf8753be21dade1cea..8a7b6864c8f318955e9d2bd00548dcf407509534 100644 GIT binary patch delta 2595 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 diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb index fa267a30975e8c1a46887eb19059365e2803e5c2..f232bf0df625b1ab106dc4acac4246df15dbb985 100644 GIT binary patch delta 3602 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 MVEU&M@pvNhcag)00RR91 diff --git a/RFIDSocket/LogControl.cs b/RFIDSocket/LogControl.cs index 04e6f40..f94acb0 100644 --- a/RFIDSocket/LogControl.cs +++ b/RFIDSocket/LogControl.cs @@ -4,30 +4,82 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; using System.Xml.Linq; +using TouchSocket.Core; 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(); - //} + public static List LogIPSelect(List lists, string ip) + { + return lists.Where(x => x.IP == ip).ToList(); + } + + public static List LogTimeSelect(List lists, DateTime start, DateTime end) + { + return lists.Where(x => x.LogTime >= start && x.LogTime <= end).ToList(); + } + + public static List LogLengthSelect(List lists, int minLength, int maxLength) + { + if (minLength == -1 && maxLength == -1) + { + return lists; + } + else if (minLength == -1 && maxLength != -1) + { + return lists.Where(x => x.Length <= maxLength).ToList(); + } + else if (minLength != -1 && maxLength == -1) + { + return lists.Where(x => x.Length >= minLength).ToList(); + } + return lists.Where(x => x.Length >= minLength && x.Length <= maxLength).ToList(); + } + + public static List LogIntervalSelect(List lists, int minInterval, int maxInterval) + { + if (minInterval == -1 && maxInterval == -1) + { + return lists; + } + else if (minInterval == -1 && maxInterval != -1) + { + return lists.Where(x => x.Interval <= maxInterval).ToList(); + } + else if (minInterval != -1 && maxInterval == -1) + { + return lists.Where(x => x.Interval >= minInterval).ToList(); + } + + return lists.Where(x => x.Interval >= minInterval && x.Interval <= maxInterval).ToList(); + } + + public static List LogStatusSelect(List lists, string status) + { + if (status.IsNullOrEmpty()) return lists; + return lists.Where(x => x.Status == status).ToList(); + } + + public static List LogTipsSelect(List lists, string tips) + { + if (tips.IsNullOrEmpty()) return lists; + return lists.Where(x => x.Tips == tips).ToList(); + } + + public static List LogEPCSelect(List lists, string epc) + { + if (epc.IsNullOrEmpty()) return lists; + return lists.Where(x => x.EPC.Contains(epc)).ToList(); + } + + public static List LogSNSelect(List lists, string sn) + { + if (sn.IsNullOrEmpty()) return lists; + return lists.Where(x => x.SN.Contains(sn)).ToList(); + } + } } diff --git a/RFIDSocket/RFIDLog.Designer.cs b/RFIDSocket/RFIDLog.Designer.cs index b40aeed..d87003f 100644 --- a/RFIDSocket/RFIDLog.Designer.cs +++ b/RFIDSocket/RFIDLog.Designer.cs @@ -28,6 +28,9 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.TimeSelect = new System.Windows.Forms.Button(); this.StartTime = new System.Windows.Forms.DateTimePicker(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -52,31 +55,39 @@ this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.label6 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.MinLength = new System.Windows.Forms.TextBox(); - this.MaxLength = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.EPCText = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.SNText = new System.Windows.Forms.TextBox(); + this.label14 = new System.Windows.Forms.Label(); + this.TipsText = new System.Windows.Forms.ComboBox(); + this.label12 = new System.Windows.Forms.Label(); + this.StatusText = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); this.MaxInterval = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.MinInterval = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.StatusText = new System.Windows.Forms.ComboBox(); - this.TipsText = new System.Windows.Forms.ComboBox(); - this.label12 = new System.Windows.Forms.Label(); - this.SNText = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.EPCText = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); + this.MaxLength = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.MinLength = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); this.SelectAll = new System.Windows.Forms.Button(); this.label16 = new System.Windows.Forms.Label(); - this.AllAddress = new System.Windows.Forms.ComboBox(); + this.AllIP = new System.Windows.Forms.ComboBox(); + this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.sNDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.intervalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ePCDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tipsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.LogContent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); this.SuspendLayout(); // // TimeSelect @@ -126,14 +137,24 @@ // // LogContent // + this.LogContent.AutoGenerateColumns = false; this.LogContent.ColumnHeadersHeight = 20; + this.LogContent.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.sNDataGridViewTextBoxColumn, + this.intervalDataGridViewTextBoxColumn, + this.lengthDataGridViewTextBoxColumn, + this.ePCDataGridViewTextBoxColumn, + this.tipsDataGridViewTextBoxColumn, + this.logTimeDataGridViewTextBoxColumn}); + this.LogContent.DataSource = this.rFIDContentBindingSource; this.LogContent.Location = new System.Drawing.Point(301, 15); this.LogContent.Margin = new System.Windows.Forms.Padding(4); this.LogContent.Name = "LogContent"; + this.LogContent.ReadOnly = true; this.LogContent.RowHeadersVisible = false; this.LogContent.RowHeadersWidth = 51; this.LogContent.RowTemplate.Height = 18; - this.LogContent.Size = new System.Drawing.Size(667, 1230); + this.LogContent.Size = new System.Drawing.Size(911, 1230); this.LogContent.TabIndex = 7; // // SelectByCondition @@ -145,7 +166,7 @@ this.SelectByCondition.TabIndex = 2; this.SelectByCondition.Text = "条件查询"; this.SelectByCondition.UseVisualStyleBackColor = true; - this.SelectByCondition.Click += new System.EventHandler(this.SelectAll_Click); + this.SelectByCondition.Click += new System.EventHandler(this.SelectByCondition_Click); // // ShortCount // @@ -343,37 +364,71 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "条件查询"; // - // label1 + // EPCText // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 37); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(67, 15); - this.label1.TabIndex = 0; - this.label1.Text = "最小包长"; + this.EPCText.Location = new System.Drawing.Point(111, 188); + this.EPCText.Name = "EPCText"; + this.EPCText.Size = new System.Drawing.Size(121, 25); + this.EPCText.TabIndex = 15; // - // MinLength + // label15 // - this.MinLength.Location = new System.Drawing.Point(79, 32); - this.MinLength.Name = "MinLength"; - this.MinLength.Size = new System.Drawing.Size(52, 25); - this.MinLength.TabIndex = 1; + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(40, 193); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(67, 15); + this.label15.TabIndex = 14; + this.label15.Text = "读码内容"; // - // MaxLength + // SNText // - this.MaxLength.Location = new System.Drawing.Point(216, 32); - this.MaxLength.Name = "MaxLength"; - this.MaxLength.Size = new System.Drawing.Size(52, 25); - this.MaxLength.TabIndex = 3; + this.SNText.Location = new System.Drawing.Point(111, 157); + this.SNText.Name = "SNText"; + this.SNText.Size = new System.Drawing.Size(121, 25); + this.SNText.TabIndex = 13; // - // label2 + // label14 // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(143, 37); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(67, 15); - this.label2.TabIndex = 2; - this.label2.Text = "最大包长"; + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(40, 162); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(52, 15); + this.label14.TabIndex = 12; + this.label14.Text = "包裹号"; + // + // TipsText + // + this.TipsText.FormattingEnabled = true; + this.TipsText.Location = new System.Drawing.Point(111, 123); + this.TipsText.Name = "TipsText"; + this.TipsText.Size = new System.Drawing.Size(121, 23); + this.TipsText.TabIndex = 11; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(38, 127); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(67, 15); + this.label12.TabIndex = 10; + this.label12.Text = "返回结果"; + // + // StatusText + // + this.StatusText.FormattingEnabled = true; + this.StatusText.Location = new System.Drawing.Point(111, 94); + this.StatusText.Name = "StatusText"; + this.StatusText.Size = new System.Drawing.Size(121, 23); + this.StatusText.TabIndex = 9; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(38, 98); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(67, 15); + this.label5.TabIndex = 8; + this.label5.Text = "读码结果"; // // MaxInterval // @@ -407,71 +462,37 @@ this.label4.TabIndex = 4; this.label4.Text = "最小间距"; // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(38, 98); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(67, 15); - this.label5.TabIndex = 8; - this.label5.Text = "读码结果"; - // - // StatusText - // - this.StatusText.FormattingEnabled = true; - this.StatusText.Location = new System.Drawing.Point(111, 94); - this.StatusText.Name = "StatusText"; - this.StatusText.Size = new System.Drawing.Size(121, 23); - this.StatusText.TabIndex = 9; - // - // TipsText - // - this.TipsText.FormattingEnabled = true; - this.TipsText.Location = new System.Drawing.Point(111, 123); - this.TipsText.Name = "TipsText"; - this.TipsText.Size = new System.Drawing.Size(121, 23); - this.TipsText.TabIndex = 11; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(38, 127); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(67, 15); - this.label12.TabIndex = 10; - this.label12.Text = "返回结果"; - // - // SNText + // MaxLength // - this.SNText.Location = new System.Drawing.Point(111, 157); - this.SNText.Name = "SNText"; - this.SNText.Size = new System.Drawing.Size(121, 25); - this.SNText.TabIndex = 13; + this.MaxLength.Location = new System.Drawing.Point(216, 32); + this.MaxLength.Name = "MaxLength"; + this.MaxLength.Size = new System.Drawing.Size(52, 25); + this.MaxLength.TabIndex = 3; // - // label14 + // label2 // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(40, 162); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(52, 15); - this.label14.TabIndex = 12; - this.label14.Text = "包裹号"; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(143, 37); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(67, 15); + this.label2.TabIndex = 2; + this.label2.Text = "最大包长"; // - // EPCText + // MinLength // - this.EPCText.Location = new System.Drawing.Point(111, 188); - this.EPCText.Name = "EPCText"; - this.EPCText.Size = new System.Drawing.Size(121, 25); - this.EPCText.TabIndex = 15; + this.MinLength.Location = new System.Drawing.Point(79, 32); + this.MinLength.Name = "MinLength"; + this.MinLength.Size = new System.Drawing.Size(52, 25); + this.MinLength.TabIndex = 1; // - // label15 + // label1 // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(40, 193); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(67, 15); - this.label15.TabIndex = 14; - this.label15.Text = "读码内容"; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 37); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(67, 15); + this.label1.TabIndex = 0; + this.label1.Text = "最小包长"; // // SelectAll // @@ -482,6 +503,7 @@ this.SelectAll.TabIndex = 16; this.SelectAll.Text = "综合条件查询"; this.SelectAll.UseVisualStyleBackColor = true; + this.SelectAll.Click += new System.EventHandler(this.SelectAll_Click); // // label16 // @@ -492,21 +514,85 @@ this.label16.TabIndex = 59; this.label16.Text = "选择查询地址"; // - // AllAddress - // - this.AllAddress.FormattingEnabled = true; - this.AllAddress.Location = new System.Drawing.Point(136, 25); - this.AllAddress.Name = "AllAddress"; - this.AllAddress.Size = new System.Drawing.Size(143, 23); - this.AllAddress.TabIndex = 58; + // AllIP + // + this.AllIP.FormattingEnabled = true; + this.AllIP.Location = new System.Drawing.Point(136, 25); + this.AllIP.Name = "AllIP"; + this.AllIP.Size = new System.Drawing.Size(143, 23); + this.AllIP.TabIndex = 58; + // + // rFIDContentBindingSource + // + this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); + // + // sNDataGridViewTextBoxColumn + // + this.sNDataGridViewTextBoxColumn.DataPropertyName = "SN"; + dataGridViewCellStyle1.Format = "G"; + dataGridViewCellStyle1.NullValue = null; + this.sNDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.sNDataGridViewTextBoxColumn.HeaderText = "包裹码"; + this.sNDataGridViewTextBoxColumn.MinimumWidth = 6; + this.sNDataGridViewTextBoxColumn.Name = "sNDataGridViewTextBoxColumn"; + this.sNDataGridViewTextBoxColumn.ReadOnly = true; + this.sNDataGridViewTextBoxColumn.Width = 60; + // + // intervalDataGridViewTextBoxColumn + // + this.intervalDataGridViewTextBoxColumn.DataPropertyName = "Interval"; + this.intervalDataGridViewTextBoxColumn.HeaderText = "间距"; + this.intervalDataGridViewTextBoxColumn.MinimumWidth = 6; + this.intervalDataGridViewTextBoxColumn.Name = "intervalDataGridViewTextBoxColumn"; + this.intervalDataGridViewTextBoxColumn.ReadOnly = true; + this.intervalDataGridViewTextBoxColumn.Width = 60; + // + // lengthDataGridViewTextBoxColumn + // + this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length"; + this.lengthDataGridViewTextBoxColumn.HeaderText = "包长"; + this.lengthDataGridViewTextBoxColumn.MinimumWidth = 6; + this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn"; + this.lengthDataGridViewTextBoxColumn.ReadOnly = true; + this.lengthDataGridViewTextBoxColumn.Width = 60; + // + // ePCDataGridViewTextBoxColumn + // + this.ePCDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ePCDataGridViewTextBoxColumn.DataPropertyName = "EPC"; + this.ePCDataGridViewTextBoxColumn.HeaderText = "读取内容"; + this.ePCDataGridViewTextBoxColumn.MinimumWidth = 6; + this.ePCDataGridViewTextBoxColumn.Name = "ePCDataGridViewTextBoxColumn"; + this.ePCDataGridViewTextBoxColumn.ReadOnly = true; + // + // tipsDataGridViewTextBoxColumn + // + this.tipsDataGridViewTextBoxColumn.DataPropertyName = "Tips"; + this.tipsDataGridViewTextBoxColumn.HeaderText = "状态"; + this.tipsDataGridViewTextBoxColumn.MinimumWidth = 6; + this.tipsDataGridViewTextBoxColumn.Name = "tipsDataGridViewTextBoxColumn"; + this.tipsDataGridViewTextBoxColumn.ReadOnly = true; + this.tipsDataGridViewTextBoxColumn.Width = 80; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + dataGridViewCellStyle2.Format = "G"; + dataGridViewCellStyle2.NullValue = null; + this.logTimeDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "记录时间"; + this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.ReadOnly = true; + this.logTimeDataGridViewTextBoxColumn.Width = 125; // // RFIDLog // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(982, 1258); + this.ClientSize = new System.Drawing.Size(1226, 1258); this.Controls.Add(this.label16); - this.Controls.Add(this.AllAddress); + this.Controls.Add(this.AllIP); this.Controls.Add(this.SelectAll); this.Controls.Add(this.groupBox2); this.Controls.Add(this.ShortCount); @@ -538,6 +624,7 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -587,6 +674,13 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Button SelectAll; private System.Windows.Forms.Label label16; - private System.Windows.Forms.ComboBox AllAddress; + private System.Windows.Forms.ComboBox AllIP; + private System.Windows.Forms.BindingSource rFIDContentBindingSource; + private System.Windows.Forms.DataGridViewTextBoxColumn sNDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn intervalDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn lengthDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn ePCDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn tipsDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; } } \ No newline at end of file diff --git a/RFIDSocket/RFIDLog.cs b/RFIDSocket/RFIDLog.cs index 90792fb..8d0b353 100644 --- a/RFIDSocket/RFIDLog.cs +++ b/RFIDSocket/RFIDLog.cs @@ -16,48 +16,107 @@ namespace RFIDSocket { List rFIDContents = new List(); + List AfterSelect = new List(); BaseContentServiceImpl sql = new BaseContentServiceImpl(); - public RFIDLog() + + List listStatus = new List { - InitializeComponent(); - StartTime.Value = DateTime.Now.AddDays(-3); - List listStatus = new List - { - "", - "NR", - "GR", - }; + "", + "NR", + "GR", + }; - Dictionary listTips = new Dictionary - { - {"ok", "正常"}, - {"noread", "无读"}, - {"near", "近距离"}, - {"short", "包过短"}, - {"multi", "多标签"}, - }; + Dictionary listTips = new Dictionary + { + {"", ""}, + {"正常", "ok"}, + {"无读", "noread"}, + {"近距离", "near"}, + {"包过短", "short"}, + {"多标签", "multi"}, + }; + public RFIDLog() + { + InitializeComponent(); Init(); } private void Init() { rFIDContents = sql.GetContentInfos(); + StartTime.Value = DateTime.Now.AddDays(-3); + AllIP.DataSource = ServerConnect.Names; + StatusText.DataSource = listStatus; + TipsText.DataSource = listTips.Keys.ToArray(); } private void TimeSelect_Click(object sender, EventArgs e) { + rFIDContents = LogControl.LogIPSelect(sql.GetContentInfos(), ServerConnect.IPConfig[AllIP.Text]); + AfterSelect = LogControl.LogTimeSelect(rFIDContents, StartTime.Value, EndTime.Value); + DataCount(); + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = AfterSelect; + } + } + + private void SelectByCondition_Click(object sender, EventArgs e) + { + rFIDContents = LogControl.LogIPSelect(sql.GetContentInfos(), ServerConnect.IPConfig[AllIP.Text]); + AfterSelect = SelectCondition(rFIDContents); + DataCount(); if (LogContent != null) { LogContent.DataSource = null; - //LogContent.DataSource = LogControl.LogTimeSelect(rFIDContents, StartTime.Value, EndTime.Value); + LogContent.DataSource = AfterSelect; } } - private void SelectAll_Click(object sender, EventArgs e) { - + rFIDContents = LogControl.LogIPSelect(sql.GetContentInfos(), ServerConnect.IPConfig[AllIP.Text]); + AfterSelect = LogControl.LogTimeSelect(SelectCondition(rFIDContents), + StartTime.Value, EndTime.Value); + DataCount(); + if (LogContent != null) + { + LogContent.DataSource = null; + LogContent.DataSource = AfterSelect; + } + } + + private List SelectCondition(List content) + { + AfterSelect = LogControl.LogLengthSelect( + LogControl.LogIntervalSelect( + LogControl.LogStatusSelect( + LogControl.LogTipsSelect( + LogControl.LogSNSelect( + LogControl.LogEPCSelect(content, + EPCText.Text), + SNText.Text), + listTips[TipsText.Text]), + StatusText.Text), + int.TryParse(MinInterval.Text, out int c) ? c : -1, + int.TryParse(MaxInterval.Text, out int d) ? d : -1), + int.TryParse(MinLength.Text, out int a) ? a : -1, + int.TryParse(MaxLength.Text, out int b) ? b : -1); + DataCount(); + return AfterSelect; + } + + private void DataCount() + { + TotalCount.Text = AfterSelect.Count.ToString(); + NormalCount.Text = AfterSelect.Where(x => x.Tips == "ok").Count().ToString(); + WarningCount.Text = AfterSelect.Where(x => x.Tips != "ok").Count().ToString(); + NoReadCount.Text = AfterSelect.Where(x => x.Tips == "noread").Count().ToString(); + NearCount.Text = AfterSelect.Where(x => x.Tips == "near").Count().ToString(); + ShortCount.Text = AfterSelect.Where(x => x.Tips == "short").Count().ToString(); + MultiCount.Text = AfterSelect.Where(x => x.Tips == "multi").Count().ToString(); } } diff --git a/RFIDSocket/RFIDLog.resx b/RFIDSocket/RFIDLog.resx index 1af7de1..ca21880 100644 --- a/RFIDSocket/RFIDLog.resx +++ b/RFIDSocket/RFIDLog.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/RFIDSocket/RFIDSocket.Designer.cs b/RFIDSocket/RFIDSocket.Designer.cs index daabc61..191bd8e 100644 --- a/RFIDSocket/RFIDSocket.Designer.cs +++ b/RFIDSocket/RFIDSocket.Designer.cs @@ -29,13 +29,9 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.CotentData = new System.Windows.Forms.DataGridView(); - this.sNDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.intervalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ePCDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tipsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rFIDContentBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ClientIP = new System.Windows.Forms.TextBox(); this.SetAddress = new System.Windows.Forms.Button(); @@ -78,6 +74,12 @@ this.label14 = new System.Windows.Forms.Label(); this.ServerPort = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); + this.sNDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.intervalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lengthDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ePCDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tipsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.logTimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.CotentData)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rFIDContentBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); @@ -99,84 +101,36 @@ this.tipsDataGridViewTextBoxColumn, 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); + this.CotentData.Location = new System.Drawing.Point(12, 129); + this.CotentData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.CotentData.Name = "CotentData"; this.CotentData.RowHeadersVisible = false; this.CotentData.RowHeadersWidth = 51; this.CotentData.RowTemplate.Height = 17; this.CotentData.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.CotentData.Size = new System.Drawing.Size(683, 870); + this.CotentData.Size = new System.Drawing.Size(911, 1088); this.CotentData.TabIndex = 0; // - // sNDataGridViewTextBoxColumn - // - this.sNDataGridViewTextBoxColumn.DataPropertyName = "SN"; - this.sNDataGridViewTextBoxColumn.HeaderText = "包裹码"; - this.sNDataGridViewTextBoxColumn.MinimumWidth = 6; - this.sNDataGridViewTextBoxColumn.Name = "sNDataGridViewTextBoxColumn"; - this.sNDataGridViewTextBoxColumn.Width = 60; - // - // intervalDataGridViewTextBoxColumn - // - this.intervalDataGridViewTextBoxColumn.DataPropertyName = "Interval"; - this.intervalDataGridViewTextBoxColumn.HeaderText = "间距"; - this.intervalDataGridViewTextBoxColumn.MinimumWidth = 6; - this.intervalDataGridViewTextBoxColumn.Name = "intervalDataGridViewTextBoxColumn"; - this.intervalDataGridViewTextBoxColumn.Width = 60; - // - // lengthDataGridViewTextBoxColumn - // - this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length"; - this.lengthDataGridViewTextBoxColumn.HeaderText = "包长"; - this.lengthDataGridViewTextBoxColumn.MinimumWidth = 6; - this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn"; - this.lengthDataGridViewTextBoxColumn.Width = 60; - // - // ePCDataGridViewTextBoxColumn - // - this.ePCDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.ePCDataGridViewTextBoxColumn.DataPropertyName = "EPC"; - this.ePCDataGridViewTextBoxColumn.HeaderText = "读取内容"; - this.ePCDataGridViewTextBoxColumn.MinimumWidth = 6; - this.ePCDataGridViewTextBoxColumn.Name = "ePCDataGridViewTextBoxColumn"; - // - // tipsDataGridViewTextBoxColumn - // - this.tipsDataGridViewTextBoxColumn.DataPropertyName = "Tips"; - this.tipsDataGridViewTextBoxColumn.HeaderText = "状态"; - this.tipsDataGridViewTextBoxColumn.MinimumWidth = 6; - this.tipsDataGridViewTextBoxColumn.Name = "tipsDataGridViewTextBoxColumn"; - this.tipsDataGridViewTextBoxColumn.Width = 80; - // - // logTimeDataGridViewTextBoxColumn - // - this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; - this.logTimeDataGridViewTextBoxColumn.HeaderText = "记录时间"; - this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; - this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; - this.logTimeDataGridViewTextBoxColumn.Width = 120; - // // rFIDContentBindingSource // this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); // // ClientIP // - this.ClientIP.Location = new System.Drawing.Point(114, 22); - this.ClientIP.Margin = new System.Windows.Forms.Padding(2); + this.ClientIP.Location = new System.Drawing.Point(152, 28); + this.ClientIP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ClientIP.MaxLength = 6; this.ClientIP.Name = "ClientIP"; - this.ClientIP.Size = new System.Drawing.Size(98, 21); + this.ClientIP.Size = new System.Drawing.Size(129, 25); this.ClientIP.TabIndex = 7; this.ClientIP.Text = "127.0.0.1"; // // SetAddress // - this.SetAddress.Location = new System.Drawing.Point(265, 9); - this.SetAddress.Margin = new System.Windows.Forms.Padding(2); + this.SetAddress.Location = new System.Drawing.Point(353, 11); + this.SetAddress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.SetAddress.Name = "SetAddress"; - this.SetAddress.Size = new System.Drawing.Size(120, 45); + this.SetAddress.Size = new System.Drawing.Size(160, 56); this.SetAddress.TabIndex = 6; this.SetAddress.Text = "确认客户端地址"; this.SetAddress.UseVisualStyleBackColor = true; @@ -185,29 +139,28 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 26); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(12, 32); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(101, 12); + this.label1.Size = new System.Drawing.Size(128, 15); this.label1.TabIndex = 1; this.label1.Text = "客户端IP：端口号"; // // ClientPort // - this.ClientPort.Location = new System.Drawing.Point(216, 22); - this.ClientPort.Margin = new System.Windows.Forms.Padding(2); + this.ClientPort.Location = new System.Drawing.Point(288, 28); + this.ClientPort.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ClientPort.MaxLength = 6; this.ClientPort.Name = "ClientPort"; - this.ClientPort.Size = new System.Drawing.Size(45, 21); + this.ClientPort.Size = new System.Drawing.Size(59, 25); this.ClientPort.TabIndex = 0; this.ClientPort.Text = "1234"; // // MonitorOnOff // - this.MonitorOnOff.Location = new System.Drawing.Point(696, 10); - this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(2); + this.MonitorOnOff.Location = new System.Drawing.Point(928, 12); + this.MonitorOnOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MonitorOnOff.Name = "MonitorOnOff"; - this.MonitorOnOff.Size = new System.Drawing.Size(83, 40); + this.MonitorOnOff.Size = new System.Drawing.Size(111, 50); this.MonitorOnOff.TabIndex = 7; this.MonitorOnOff.Text = "启动监听"; this.MonitorOnOff.UseVisualStyleBackColor = true; @@ -216,10 +169,9 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(791, 22); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(1055, 28); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(65, 12); + this.label4.Size = new System.Drawing.Size(82, 15); this.label4.TabIndex = 8; this.label4.Text = "监听状态："; // @@ -227,10 +179,9 @@ // this.MonitorState.AutoSize = true; this.MonitorState.BackColor = System.Drawing.Color.Transparent; - this.MonitorState.Location = new System.Drawing.Point(860, 22); - this.MonitorState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.MonitorState.Location = new System.Drawing.Point(1147, 28); this.MonitorState.Name = "MonitorState"; - this.MonitorState.Size = new System.Drawing.Size(17, 12); + this.MonitorState.Size = new System.Drawing.Size(22, 15); this.MonitorState.TabIndex = 9; this.MonitorState.Text = "关"; // @@ -242,10 +193,10 @@ // // PgUp // - this.PgUp.Location = new System.Drawing.Point(9, 59); - this.PgUp.Margin = new System.Windows.Forms.Padding(2); + this.PgUp.Location = new System.Drawing.Point(12, 74); + this.PgUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.PgUp.Name = "PgUp"; - this.PgUp.Size = new System.Drawing.Size(101, 40); + this.PgUp.Size = new System.Drawing.Size(135, 50); this.PgUp.TabIndex = 8; this.PgUp.Text = "上一页"; this.PgUp.UseVisualStyleBackColor = true; @@ -253,10 +204,10 @@ // // PgDn // - this.PgDn.Location = new System.Drawing.Point(591, 59); - this.PgDn.Margin = new System.Windows.Forms.Padding(2); + this.PgDn.Location = new System.Drawing.Point(788, 74); + this.PgDn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.PgDn.Name = "PgDn"; - this.PgDn.Size = new System.Drawing.Size(101, 40); + this.PgDn.Size = new System.Drawing.Size(135, 50); this.PgDn.TabIndex = 13; this.PgDn.Text = "下一页"; this.PgDn.UseVisualStyleBackColor = true; @@ -267,10 +218,9 @@ this.PageRange.AutoSize = true; this.PageRange.BackColor = System.Drawing.Color.Transparent; this.PageRange.Font = new System.Drawing.Font("宋体", 12F); - this.PageRange.Location = new System.Drawing.Point(331, 70); - this.PageRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.PageRange.Location = new System.Drawing.Point(441, 88); this.PageRange.Name = "PageRange"; - this.PageRange.Size = new System.Drawing.Size(55, 16); + this.PageRange.Size = new System.Drawing.Size(69, 20); this.PageRange.TabIndex = 15; this.PageRange.Text = "1 - 50"; // @@ -278,19 +228,18 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 12F); - this.label3.Location = new System.Drawing.Point(262, 70); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(349, 88); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(87, 16); + this.label3.Size = new System.Drawing.Size(109, 20); this.label3.TabIndex = 14; this.label3.Text = "显示条数："; // // LogStart // - this.LogStart.Location = new System.Drawing.Point(746, 81); - this.LogStart.Margin = new System.Windows.Forms.Padding(2); + this.LogStart.Location = new System.Drawing.Point(995, 101); + this.LogStart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.LogStart.Name = "LogStart"; - this.LogStart.Size = new System.Drawing.Size(85, 40); + this.LogStart.Size = new System.Drawing.Size(113, 50); this.LogStart.TabIndex = 16; this.LogStart.Text = "日志查询"; this.LogStart.UseVisualStyleBackColor = true; @@ -300,10 +249,9 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 12F); - this.label2.Location = new System.Drawing.Point(786, 165); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(1048, 206); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 16); + this.label2.Size = new System.Drawing.Size(89, 20); this.label2.TabIndex = 17; this.label2.Text = "连接状态"; // @@ -311,10 +259,9 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 12F); - this.label6.Location = new System.Drawing.Point(786, 349); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(1048, 436); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(55, 16); + this.label6.Size = new System.Drawing.Size(69, 20); this.label6.TabIndex = 21; this.label6.Text = "总数量"; // @@ -322,10 +269,9 @@ // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 12F); - this.label7.Location = new System.Drawing.Point(786, 441); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(1048, 551); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(71, 16); + this.label7.Size = new System.Drawing.Size(89, 20); this.label7.TabIndex = 23; this.label7.Text = "正常数量"; // @@ -333,20 +279,19 @@ // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("宋体", 12F); - this.label8.Location = new System.Drawing.Point(786, 534); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(1048, 668); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(71, 16); + this.label8.Size = new System.Drawing.Size(89, 20); this.label8.TabIndex = 25; this.label8.Text = "异常数量"; // // pictureBox5 // this.pictureBox5.Image = global::RFIDSocket.Properties.Resources.WarningCount; - this.pictureBox5.Location = new System.Drawing.Point(734, 535); - this.pictureBox5.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox5.Location = new System.Drawing.Point(979, 669); + this.pictureBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(45, 48); + this.pictureBox5.Size = new System.Drawing.Size(60, 60); this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox5.TabIndex = 26; this.pictureBox5.TabStop = false; @@ -354,10 +299,10 @@ // pictureBox4 // this.pictureBox4.Image = global::RFIDSocket.Properties.Resources.NormalCount; - this.pictureBox4.Location = new System.Drawing.Point(734, 442); - this.pictureBox4.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox4.Location = new System.Drawing.Point(979, 552); + this.pictureBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(45, 48); + this.pictureBox4.Size = new System.Drawing.Size(60, 60); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox4.TabIndex = 24; this.pictureBox4.TabStop = false; @@ -365,10 +310,10 @@ // pictureBox3 // this.pictureBox3.Image = global::RFIDSocket.Properties.Resources.TotalCount; - this.pictureBox3.Location = new System.Drawing.Point(734, 350); - this.pictureBox3.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox3.Location = new System.Drawing.Point(979, 438); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(45, 48); + this.pictureBox3.Size = new System.Drawing.Size(60, 60); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox3.TabIndex = 22; this.pictureBox3.TabStop = false; @@ -376,10 +321,10 @@ // DevicePictureBox // this.DevicePictureBox.Image = global::RFIDSocket.Properties.Resources.RunNormal; - this.DevicePictureBox.Location = new System.Drawing.Point(734, 256); - this.DevicePictureBox.Margin = new System.Windows.Forms.Padding(2); + this.DevicePictureBox.Location = new System.Drawing.Point(979, 320); + this.DevicePictureBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.DevicePictureBox.Name = "DevicePictureBox"; - this.DevicePictureBox.Size = new System.Drawing.Size(45, 48); + this.DevicePictureBox.Size = new System.Drawing.Size(60, 60); this.DevicePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.DevicePictureBox.TabIndex = 20; this.DevicePictureBox.TabStop = false; @@ -387,10 +332,10 @@ // ConnectPictureBox // this.ConnectPictureBox.Image = global::RFIDSocket.Properties.Resources.ConnectNormal; - this.ConnectPictureBox.Location = new System.Drawing.Point(734, 166); - this.ConnectPictureBox.Margin = new System.Windows.Forms.Padding(2); + this.ConnectPictureBox.Location = new System.Drawing.Point(979, 208); + this.ConnectPictureBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ConnectPictureBox.Name = "ConnectPictureBox"; - this.ConnectPictureBox.Size = new System.Drawing.Size(45, 48); + this.ConnectPictureBox.Size = new System.Drawing.Size(60, 60); this.ConnectPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.ConnectPictureBox.TabIndex = 18; this.ConnectPictureBox.TabStop = false; @@ -399,10 +344,9 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 12F); - this.label5.Location = new System.Drawing.Point(786, 256); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(1048, 320); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(71, 16); + this.label5.Size = new System.Drawing.Size(89, 20); this.label5.TabIndex = 19; this.label5.Text = "设备状态"; // @@ -410,10 +354,9 @@ // this.ConnectState.AutoSize = true; this.ConnectState.Font = new System.Drawing.Font("宋体", 12F); - this.ConnectState.Location = new System.Drawing.Point(787, 198); - this.ConnectState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ConnectState.Location = new System.Drawing.Point(1049, 248); this.ConnectState.Name = "ConnectState"; - this.ConnectState.Size = new System.Drawing.Size(31, 16); + this.ConnectState.Size = new System.Drawing.Size(39, 20); this.ConnectState.TabIndex = 27; this.ConnectState.Text = "NAN"; // @@ -421,10 +364,9 @@ // this.DeviceState.AutoSize = true; this.DeviceState.Font = new System.Drawing.Font("宋体", 12F); - this.DeviceState.Location = new System.Drawing.Point(786, 288); - this.DeviceState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.DeviceState.Location = new System.Drawing.Point(1048, 360); this.DeviceState.Name = "DeviceState"; - this.DeviceState.Size = new System.Drawing.Size(31, 16); + this.DeviceState.Size = new System.Drawing.Size(39, 20); this.DeviceState.TabIndex = 28; this.DeviceState.Text = "NAN"; // @@ -432,10 +374,9 @@ // this.TotalCount.AutoSize = true; this.TotalCount.Font = new System.Drawing.Font("宋体", 12F); - this.TotalCount.Location = new System.Drawing.Point(787, 382); - this.TotalCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.TotalCount.Location = new System.Drawing.Point(1049, 478); this.TotalCount.Name = "TotalCount"; - this.TotalCount.Size = new System.Drawing.Size(31, 16); + this.TotalCount.Size = new System.Drawing.Size(39, 20); this.TotalCount.TabIndex = 29; this.TotalCount.Text = "NAN"; // @@ -443,10 +384,9 @@ // this.NormalCount.AutoSize = true; this.NormalCount.Font = new System.Drawing.Font("宋体", 12F); - this.NormalCount.Location = new System.Drawing.Point(787, 474); - this.NormalCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.NormalCount.Location = new System.Drawing.Point(1049, 592); this.NormalCount.Name = "NormalCount"; - this.NormalCount.Size = new System.Drawing.Size(31, 16); + this.NormalCount.Size = new System.Drawing.Size(39, 20); this.NormalCount.TabIndex = 30; this.NormalCount.Text = "NAN"; // @@ -454,10 +394,9 @@ // this.WarningCount.AutoSize = true; this.WarningCount.Font = new System.Drawing.Font("宋体", 12F); - this.WarningCount.Location = new System.Drawing.Point(787, 567); - this.WarningCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.WarningCount.Location = new System.Drawing.Point(1049, 709); this.WarningCount.Name = "WarningCount"; - this.WarningCount.Size = new System.Drawing.Size(31, 16); + this.WarningCount.Size = new System.Drawing.Size(39, 20); this.WarningCount.TabIndex = 31; this.WarningCount.Text = "NAN"; // @@ -465,10 +404,9 @@ // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("宋体", 12F); - this.label9.Location = new System.Drawing.Point(731, 618); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(975, 772); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(71, 16); + this.label9.Size = new System.Drawing.Size(89, 20); this.label9.TabIndex = 32; this.label9.Text = "未读取："; // @@ -476,10 +414,9 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("宋体", 12F); - this.label10.Location = new System.Drawing.Point(731, 644); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(975, 805); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(87, 16); + this.label10.Size = new System.Drawing.Size(109, 20); this.label10.TabIndex = 33; this.label10.Text = "间距异常："; // @@ -487,10 +424,9 @@ // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("宋体", 12F); - this.label11.Location = new System.Drawing.Point(731, 695); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(975, 869); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(71, 16); + this.label11.Size = new System.Drawing.Size(89, 20); this.label11.TabIndex = 34; this.label11.Text = "多标签："; // @@ -498,10 +434,9 @@ // this.NoReadCount.AutoSize = true; this.NoReadCount.Font = new System.Drawing.Font("宋体", 12F); - this.NoReadCount.Location = new System.Drawing.Point(818, 618); - this.NoReadCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.NoReadCount.Location = new System.Drawing.Point(1091, 772); this.NoReadCount.Name = "NoReadCount"; - this.NoReadCount.Size = new System.Drawing.Size(31, 16); + this.NoReadCount.Size = new System.Drawing.Size(39, 20); this.NoReadCount.TabIndex = 35; this.NoReadCount.Text = "NAN"; // @@ -509,10 +444,9 @@ // this.NearCount.AutoSize = true; this.NearCount.Font = new System.Drawing.Font("宋体", 12F); - this.NearCount.Location = new System.Drawing.Point(818, 644); - this.NearCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.NearCount.Location = new System.Drawing.Point(1091, 805); this.NearCount.Name = "NearCount"; - this.NearCount.Size = new System.Drawing.Size(31, 16); + this.NearCount.Size = new System.Drawing.Size(39, 20); this.NearCount.TabIndex = 36; this.NearCount.Text = "NAN"; // @@ -520,10 +454,9 @@ // this.MultiCount.AutoSize = true; this.MultiCount.Font = new System.Drawing.Font("宋体", 12F); - this.MultiCount.Location = new System.Drawing.Point(818, 695); - this.MultiCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.MultiCount.Location = new System.Drawing.Point(1091, 869); this.MultiCount.Name = "MultiCount"; - this.MultiCount.Size = new System.Drawing.Size(31, 16); + this.MultiCount.Size = new System.Drawing.Size(39, 20); this.MultiCount.TabIndex = 37; this.MultiCount.Text = "NAN"; // @@ -531,10 +464,9 @@ // this.ShortCount.AutoSize = true; this.ShortCount.Font = new System.Drawing.Font("宋体", 12F); - this.ShortCount.Location = new System.Drawing.Point(818, 670); - this.ShortCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.ShortCount.Location = new System.Drawing.Point(1091, 838); this.ShortCount.Name = "ShortCount"; - this.ShortCount.Size = new System.Drawing.Size(31, 16); + this.ShortCount.Size = new System.Drawing.Size(39, 20); this.ShortCount.TabIndex = 39; this.ShortCount.Text = "NAN"; // @@ -542,29 +474,27 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("宋体", 12F); - this.label13.Location = new System.Drawing.Point(731, 670); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(975, 838); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(71, 16); + this.label13.Size = new System.Drawing.Size(89, 20); this.label13.TabIndex = 38; this.label13.Text = "包过短："; // // ServerIP // this.ServerIP.FormattingEnabled = true; - this.ServerIP.Location = new System.Drawing.Point(478, 22); - this.ServerIP.Margin = new System.Windows.Forms.Padding(2); + this.ServerIP.Location = new System.Drawing.Point(637, 28); + this.ServerIP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ServerIP.Name = "ServerIP"; - this.ServerIP.Size = new System.Drawing.Size(108, 20); + this.ServerIP.Size = new System.Drawing.Size(143, 23); this.ServerIP.TabIndex = 40; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(389, 26); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(519, 32); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(89, 12); + this.label12.Size = new System.Drawing.Size(112, 15); this.label12.TabIndex = 41; this.label12.Text = "选择监听地址："; // @@ -572,20 +502,19 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("宋体", 12F); - this.label14.Location = new System.Drawing.Point(387, 70); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(516, 88); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(47, 16); + this.label14.Size = new System.Drawing.Size(59, 20); this.label14.TabIndex = 42; this.label14.Text = "共200"; // // ServerPort // - this.ServerPort.Location = new System.Drawing.Point(635, 22); - this.ServerPort.Margin = new System.Windows.Forms.Padding(2); + this.ServerPort.Location = new System.Drawing.Point(847, 28); + this.ServerPort.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ServerPort.MaxLength = 6; this.ServerPort.Name = "ServerPort"; - this.ServerPort.Size = new System.Drawing.Size(45, 21); + this.ServerPort.Size = new System.Drawing.Size(59, 25); this.ServerPort.TabIndex = 43; this.ServerPort.Text = "1234"; // @@ -593,18 +522,71 @@ // this.label15.AutoSize = true; this.label15.BackColor = System.Drawing.Color.Transparent; - this.label15.Location = new System.Drawing.Point(590, 26); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(787, 32); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(41, 12); + this.label15.Size = new System.Drawing.Size(52, 15); this.label15.TabIndex = 44; this.label15.Text = "端口号"; // + // sNDataGridViewTextBoxColumn + // + this.sNDataGridViewTextBoxColumn.DataPropertyName = "SN"; + dataGridViewCellStyle1.Format = "G"; + dataGridViewCellStyle1.NullValue = null; + this.sNDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.sNDataGridViewTextBoxColumn.HeaderText = "包裹码"; + this.sNDataGridViewTextBoxColumn.MinimumWidth = 6; + this.sNDataGridViewTextBoxColumn.Name = "sNDataGridViewTextBoxColumn"; + this.sNDataGridViewTextBoxColumn.Width = 60; + // + // intervalDataGridViewTextBoxColumn + // + this.intervalDataGridViewTextBoxColumn.DataPropertyName = "Interval"; + this.intervalDataGridViewTextBoxColumn.HeaderText = "间距"; + this.intervalDataGridViewTextBoxColumn.MinimumWidth = 6; + this.intervalDataGridViewTextBoxColumn.Name = "intervalDataGridViewTextBoxColumn"; + this.intervalDataGridViewTextBoxColumn.Width = 60; + // + // lengthDataGridViewTextBoxColumn + // + this.lengthDataGridViewTextBoxColumn.DataPropertyName = "Length"; + this.lengthDataGridViewTextBoxColumn.HeaderText = "包长"; + this.lengthDataGridViewTextBoxColumn.MinimumWidth = 6; + this.lengthDataGridViewTextBoxColumn.Name = "lengthDataGridViewTextBoxColumn"; + this.lengthDataGridViewTextBoxColumn.Width = 60; + // + // ePCDataGridViewTextBoxColumn + // + this.ePCDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ePCDataGridViewTextBoxColumn.DataPropertyName = "EPC"; + this.ePCDataGridViewTextBoxColumn.HeaderText = "读取内容"; + this.ePCDataGridViewTextBoxColumn.MinimumWidth = 6; + this.ePCDataGridViewTextBoxColumn.Name = "ePCDataGridViewTextBoxColumn"; + // + // tipsDataGridViewTextBoxColumn + // + this.tipsDataGridViewTextBoxColumn.DataPropertyName = "Tips"; + this.tipsDataGridViewTextBoxColumn.HeaderText = "状态"; + this.tipsDataGridViewTextBoxColumn.MinimumWidth = 6; + this.tipsDataGridViewTextBoxColumn.Name = "tipsDataGridViewTextBoxColumn"; + this.tipsDataGridViewTextBoxColumn.Width = 80; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + dataGridViewCellStyle2.Format = "G"; + dataGridViewCellStyle2.NullValue = null; + this.logTimeDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "记录时间"; + this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.Width = 125; + // // RFIDSocket // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(892, 983); + this.ClientSize = new System.Drawing.Size(1189, 1229); this.Controls.Add(this.label15); this.Controls.Add(this.ServerPort); this.Controls.Add(this.label14); @@ -646,7 +628,7 @@ this.Controls.Add(this.label4); this.Controls.Add(this.MonitorOnOff); this.Controls.Add(this.CotentData); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "RFIDSocket"; this.Text = " 通道门监听"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.RFIDSocket_FormClosing); @@ -704,15 +686,15 @@ private System.Windows.Forms.ComboBox ServerIP; private System.Windows.Forms.Label label12; private System.Windows.Forms.BindingSource rFIDContentBindingSource; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox ServerPort; + private System.Windows.Forms.Label label15; private System.Windows.Forms.DataGridViewTextBoxColumn sNDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn intervalDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn lengthDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn ePCDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn tipsDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn logTimeDataGridViewTextBoxColumn; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox ServerPort; - private System.Windows.Forms.Label label15; } } diff --git a/RFIDSocket/RFIDSocket.cs b/RFIDSocket/RFIDSocket.cs index 6df5ffa..0a76ce4 100644 --- a/RFIDSocket/RFIDSocket.cs +++ b/RFIDSocket/RFIDSocket.cs @@ -57,7 +57,7 @@ namespace RFIDSocket { if (!ServerConnect.State) { - Dictionary results = ServerConnect.ConnectAllServer(ServerPort.Text, CIP, CPort); + Dictionary results = ServerConnect.ConnectAllServer(CIP, CPort, ServerPort.Text); bool flag = false; foreach(var pair in results) { diff --git a/RFIDSocket/ServerConnect.cs b/RFIDSocket/ServerConnect.cs index 29cc001..a7d74fa 100644 --- a/RFIDSocket/ServerConnect.cs +++ b/RFIDSocket/ServerConnect.cs @@ -53,21 +53,6 @@ namespace RFIDSocket } } - /// - /// 查找数据表里所有IP - /// - /// - public List GetAllIP() - { - var groups = baseContentServiceImpl.GetContentInfos().GroupBy(x => x.IP); - List result = new List(); - foreach (var group in groups) - { - result.Add(group.Key); - } - return result; - } - /// /// 连接所有服务端 /// @@ -75,13 +60,16 @@ namespace RFIDSocket /// /// /// 成功与否结果 - public Dictionary ConnectAllServer(string serverPort, string clientIP, string clientPort) + public Dictionary ConnectAllServer(string clientIP, string clientPort, string serverPort) { int count = IPs.Length; Dictionary results = new Dictionary(); for (int i = 0; i < count; i++) { - results.Add(Names[i], TcpClients[i].ClientStart(IPs[i], serverPort, clientIP, clientPort)); + if (!TcpClients[i].State) + { + results.Add(Names[i], TcpClients[i].ClientStart(clientIP, clientPort, IPs[i], serverPort)); + } } State = true; return results; @@ -97,7 +85,10 @@ namespace RFIDSocket Dictionary results = new Dictionary(); for (int i = 0; i < count; i++) { - results.Add(Names[i], TcpClients[i].ClientStop()); + if (TcpClients[i].State) + { + results.Add(Names[i], TcpClients[i].ClientStop()); + } } State = false; return results; @@ -113,11 +104,28 @@ namespace RFIDSocket Dictionary results = new Dictionary(); for (int i = 0; i < count; i++) { - results.Add(Names[i], TcpClients[i].ClientDispose()); + if (!TcpClients[i].State) + { + results.Add(Names[i], TcpClients[i].ClientDispose()); + } } return results; } + /// + /// 查找数据表里所有IP + /// + /// + public List GetAllIP() + { + var groups = baseContentServiceImpl.GetContentInfos().GroupBy(x => x.IP); + List result = new List(); + foreach (var group in groups) + { + result.Add(group.Key); + } + return result; + } } }