change - 监控界面不显示一天以前的数据，软件启动时自动清除三个月以前的数据，删除线体选择的空白行

HighWayIot.Repository/service/Impl/BaseContentServiceImpl.cs

@@ -49,7 +49,8 @@ namespace HighWayIot.Repository.service.Impl
         {
             try
             {
-                List<RFIDContent> deviceInfo = _repository.GetList(x => x.LineNo == lineNo).OrderByDescending(x => x.ID).Take(200).ToList();
+                DateTime UsefulTime = DateTime.Now - TimeSpan.FromDays(1);
+                List<RFIDContent> 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<RFIDContent> deviceInfo = _repository.GetList().OrderByDescending(x => x.ID).Take(200).ToList();
+                DateTime UsefulTime = DateTime.Now - TimeSpan.FromDays(1);
+                List<RFIDContent> 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;
             }

RFIDSocket/ClassDiagram1.cd

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 

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
             // 

RFIDSocket/RFIDLog.cs

@@ -334,13 +334,13 @@ namespace RFIDSocket
         }
 
         /// <summary>
-        /// 清除一个月之前的数据
+        /// 清除三个月之前的数据
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        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())
                 {

RFIDSocket/RFIDLog.resx

@@ -126,6 +126,15 @@
   <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LineNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>225, 17</value>
   </metadata>

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);

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<string> Ids = new List<string>();
-            Ids.Add("");
+            //Ids.Add("");
             Ids.AddRange(_xmlUtil.ClientReader().Select(x => x.ID).ToList());
 
             LineSelectCombobox.DataSource = null;
             LineSelectCombobox.DataSource = Ids;
+
+            CleanOldData();
         }
 
         /// <summary>
@@ -274,5 +277,16 @@ namespace RFIDSocket
             MessageFactory.Instance.ReadCodeRequestProcess(LineSelectCombobox.Text);
         }
 
+        /// <summary>
+        /// 清空三个月以前的数据
+        /// </summary>
+        private void CleanOldData()
+        {
+            if (!BaseContentServiceImpl.Instance.DelBeforeMonthContent())
+            {
+                MessageBox.Show("旧数据删除失败");
+            }
+        }
+
     }
 }

RFIDSocket/RFIDSocket.csproj

@@ -217,6 +217,7 @@
     <EmbeddedResource Include="RFIDSocket.resx">
       <DependentUpon>RFIDSocket.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="ClassDiagram1.cd" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\DataSources\HighWayIot.Repository.domain.RFIDContent.datasource" />

RFIDSocket/RFIDSocket.resx

@@ -126,6 +126,15 @@
   <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>159, 17</value>
   </metadata>
+  <metadata name="ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LineNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rFIDContentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>159, 17</value>
+  </metadata>
   <metadata name="TableTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>