diff --git a/HighWayIot.Repository/service/Impl/BaseContentServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseContentServiceImpl.cs index a67271f..efe6fce 100644 --- a/HighWayIot.Repository/service/Impl/BaseContentServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseContentServiceImpl.cs @@ -49,7 +49,8 @@ namespace HighWayIot.Repository.service.Impl { try { - List deviceInfo = _repository.GetList(x => x.LineNo == lineNo).OrderByDescending(x => x.ID).Take(200).ToList(); + DateTime UsefulTime = DateTime.Now - TimeSpan.FromDays(1); + List deviceInfo = _repository.GetList(x => x.LineNo == lineNo && x.LogTime >= UsefulTime).OrderByDescending(x => x.ID).Take(200).ToList(); return deviceInfo; } catch (Exception ex) @@ -63,7 +64,8 @@ namespace HighWayIot.Repository.service.Impl { try { - List deviceInfo = _repository.GetList().OrderByDescending(x => x.ID).Take(200).ToList(); + DateTime UsefulTime = DateTime.Now - TimeSpan.FromDays(1); + List deviceInfo = _repository.GetList(x => x.LogTime >= UsefulTime).OrderByDescending(x => x.ID).Take(200).ToList(); return deviceInfo; } catch (Exception ex) @@ -89,7 +91,7 @@ namespace HighWayIot.Repository.service.Impl { try { - DateTime time = DateTime.Now - TimeSpan.FromDays(30); + DateTime time = DateTime.Now - TimeSpan.FromDays(90); _repository.AsDeleteable().Where(x => x.LogTime <= time).ExecuteCommand(); return true; } diff --git a/RFIDSocket/ClassDiagram1.cd b/RFIDSocket/ClassDiagram1.cd new file mode 100644 index 0000000..7b89419 --- /dev/null +++ b/RFIDSocket/ClassDiagram1.cd @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/RFIDSocket/RFIDLog.Designer.cs b/RFIDSocket/RFIDLog.Designer.cs index e9264c8..307c999 100644 --- a/RFIDSocket/RFIDLog.Designer.cs +++ b/RFIDSocket/RFIDLog.Designer.cs @@ -434,8 +434,9 @@ this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(208, 23); this.button2.TabIndex = 22; - this.button2.Text = "清除一个月之前的数据"; + this.button2.Text = "清除三个月之前的数据"; this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click_2); // // RFIDLog // diff --git a/RFIDSocket/RFIDLog.cs b/RFIDSocket/RFIDLog.cs index 10b1378..608e2db 100644 --- a/RFIDSocket/RFIDLog.cs +++ b/RFIDSocket/RFIDLog.cs @@ -334,13 +334,13 @@ namespace RFIDSocket } /// - /// 清除一个月之前的数据 + /// 清除三个月之前的数据 /// /// /// - private void button2_Click_1(object sender, EventArgs e) + private void button2_Click_2(object sender, EventArgs e) { - if(MessageBox.Show("确认要删除之前的数据吗", "确定", MessageBoxButtons.OKCancel) == DialogResult.OK) + if (MessageBox.Show("确认要删除之前的数据吗", "确定", MessageBoxButtons.OKCancel) == DialogResult.OK) { if (!sql.DelBeforeMonthContent()) { diff --git a/RFIDSocket/RFIDLog.resx b/RFIDSocket/RFIDLog.resx index 69f0848..409f341 100644 --- a/RFIDSocket/RFIDLog.resx +++ b/RFIDSocket/RFIDLog.resx @@ -126,6 +126,15 @@ 17, 17 + + True + + + True + + + 17, 17 + 225, 17 diff --git a/RFIDSocket/RFIDSocket.Designer.cs b/RFIDSocket/RFIDSocket.Designer.cs index 161ee21..893da9d 100644 --- a/RFIDSocket/RFIDSocket.Designer.cs +++ b/RFIDSocket/RFIDSocket.Designer.cs @@ -30,6 +30,12 @@ { this.components = new System.ComponentModel.Container(); this.CotentData = new System.Windows.Forms.DataGridView(); + this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.LineNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + 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.MonitorOnOff = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); @@ -69,12 +75,6 @@ this.label8 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.LineNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - 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(); ((System.ComponentModel.ISupportInitialize)(this.rFIDStateBindingSource)).BeginInit(); @@ -118,6 +118,58 @@ this.CotentData.Size = new System.Drawing.Size(774, 799); this.CotentData.TabIndex = 0; // + // ID + // + this.ID.DataPropertyName = "ID"; + this.ID.HeaderText = "编号"; + this.ID.Name = "ID"; + this.ID.ReadOnly = true; + this.ID.Width = 40; + // + // LineNo + // + this.LineNo.DataPropertyName = "LineNo"; + this.LineNo.HeaderText = "线号"; + this.LineNo.Name = "LineNo"; + this.LineNo.ReadOnly = true; + this.LineNo.Width = 50; + // + // deviceNoDataGridViewTextBoxColumn + // + this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo"; + this.deviceNoDataGridViewTextBoxColumn.HeaderText = "格口"; + this.deviceNoDataGridViewTextBoxColumn.MinimumWidth = 6; + this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn"; + this.deviceNoDataGridViewTextBoxColumn.ReadOnly = true; + this.deviceNoDataGridViewTextBoxColumn.Width = 50; + // + // readKindDataGridViewTextBoxColumn + // + this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind"; + this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果"; + this.readKindDataGridViewTextBoxColumn.MinimumWidth = 6; + this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn"; + this.readKindDataGridViewTextBoxColumn.ReadOnly = true; + 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"; + this.contentDataGridViewTextBoxColumn.ReadOnly = true; + // + // logTimeDataGridViewTextBoxColumn + // + this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; + this.logTimeDataGridViewTextBoxColumn.HeaderText = "读取时间"; + this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; + this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; + this.logTimeDataGridViewTextBoxColumn.ReadOnly = true; + this.logTimeDataGridViewTextBoxColumn.Width = 105; + // // rFIDContentBindingSource // this.rFIDContentBindingSource.DataSource = typeof(HighWayIot.Repository.domain.RFIDContent); @@ -547,58 +599,6 @@ this.label5.TabIndex = 0; this.label5.Text = "工作状态："; // - // ID - // - this.ID.DataPropertyName = "ID"; - this.ID.HeaderText = "编号"; - this.ID.Name = "ID"; - this.ID.ReadOnly = true; - this.ID.Width = 40; - // - // LineNo - // - this.LineNo.DataPropertyName = "LineNo"; - this.LineNo.HeaderText = "线号"; - this.LineNo.Name = "LineNo"; - this.LineNo.ReadOnly = true; - this.LineNo.Width = 50; - // - // deviceNoDataGridViewTextBoxColumn - // - this.deviceNoDataGridViewTextBoxColumn.DataPropertyName = "DeviceNo"; - this.deviceNoDataGridViewTextBoxColumn.HeaderText = "格口"; - this.deviceNoDataGridViewTextBoxColumn.MinimumWidth = 6; - this.deviceNoDataGridViewTextBoxColumn.Name = "deviceNoDataGridViewTextBoxColumn"; - this.deviceNoDataGridViewTextBoxColumn.ReadOnly = true; - this.deviceNoDataGridViewTextBoxColumn.Width = 50; - // - // readKindDataGridViewTextBoxColumn - // - this.readKindDataGridViewTextBoxColumn.DataPropertyName = "ReadKind"; - this.readKindDataGridViewTextBoxColumn.HeaderText = "读码结果"; - this.readKindDataGridViewTextBoxColumn.MinimumWidth = 6; - this.readKindDataGridViewTextBoxColumn.Name = "readKindDataGridViewTextBoxColumn"; - this.readKindDataGridViewTextBoxColumn.ReadOnly = true; - 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"; - this.contentDataGridViewTextBoxColumn.ReadOnly = true; - // - // logTimeDataGridViewTextBoxColumn - // - this.logTimeDataGridViewTextBoxColumn.DataPropertyName = "LogTime"; - this.logTimeDataGridViewTextBoxColumn.HeaderText = "读取时间"; - this.logTimeDataGridViewTextBoxColumn.MinimumWidth = 6; - this.logTimeDataGridViewTextBoxColumn.Name = "logTimeDataGridViewTextBoxColumn"; - this.logTimeDataGridViewTextBoxColumn.ReadOnly = true; - this.logTimeDataGridViewTextBoxColumn.Width = 105; - // // RFIDSocket // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RFIDSocket/RFIDSocket.cs b/RFIDSocket/RFIDSocket.cs index baad1ee..cac3937 100644 --- a/RFIDSocket/RFIDSocket.cs +++ b/RFIDSocket/RFIDSocket.cs @@ -1,5 +1,6 @@ using HighWayIot.Common; using HighWayIot.Repository.domain; +using HighWayIot.Repository.service.Impl; using HighWayIot.TouchSocket; using System; using System.Collections.Generic; @@ -50,11 +51,13 @@ namespace RFIDSocket } List Ids = new List(); - Ids.Add(""); + //Ids.Add(""); Ids.AddRange(_xmlUtil.ClientReader().Select(x => x.ID).ToList()); LineSelectCombobox.DataSource = null; LineSelectCombobox.DataSource = Ids; + + CleanOldData(); } /// @@ -274,5 +277,16 @@ namespace RFIDSocket MessageFactory.Instance.ReadCodeRequestProcess(LineSelectCombobox.Text); } + /// + /// 清空三个月以前的数据 + /// + private void CleanOldData() + { + if (!BaseContentServiceImpl.Instance.DelBeforeMonthContent()) + { + MessageBox.Show("旧数据删除失败"); + } + } + } } diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj index 7a4a762..df4361a 100644 --- a/RFIDSocket/RFIDSocket.csproj +++ b/RFIDSocket/RFIDSocket.csproj @@ -217,6 +217,7 @@ RFIDSocket.cs + diff --git a/RFIDSocket/RFIDSocket.resx b/RFIDSocket/RFIDSocket.resx index 5d42f99..e7c9f33 100644 --- a/RFIDSocket/RFIDSocket.resx +++ b/RFIDSocket/RFIDSocket.resx @@ -126,6 +126,15 @@ 159, 17 + + True + + + True + + + 159, 17 + 17, 17