Browse Source

修改郑州日志读取

callm 1 month ago
parent
commit
d9d8dbb137

+ 1 - 1
FileWatcher/AutoAnalysisXmlByStep.Designer.cs

@@ -390,7 +390,7 @@
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.MaximizeBox = false;
             this.Name = "AutoAnalysisXmlByStep";
-            this.Text = "UAS自动过站解析器 2024-12-16 14:15";
+            this.Text = "UAS自动过站解析器 2026-01-22 14:15";
             this.Deactivate += new System.EventHandler(this.AutoAnalysisXmlByStep_Deactivate);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);

+ 16 - 16
FileWatcher/AutoAnalysisXmlByStep.cs

@@ -465,22 +465,22 @@ namespace FileWatcher
 
         private void Timer_Tick(object sender, EventArgs e)
         {
-            //if (deleteFile.Checked)
-            //{
-            //    var AllXmls = Directory.GetFiles(FolderPath.Text, "*.*", SearchOption.AllDirectories).Where(s => s.ToUpper().EndsWith(".TXT") || s.ToUpper().EndsWith(".INI"));
-            //    foreach (var Xml in AllXmls)
-            //    {
-            //        try
-            //        {
-            //            TxtHandleProcess(Xml.ToString());
-            //            File.Delete(Xml.ToString());
-            //        }
-            //        catch (Exception ex)
-            //        {
-
-            //        }
-            //    }
-            //}
+            if (deleteFile.Checked)
+            {
+                var AllXmls = Directory.GetFiles(FolderPath.Text, "*.*", SearchOption.AllDirectories).Where(s => s.ToUpper().EndsWith(".TXT") || s.ToUpper().EndsWith(".INI"));
+                foreach (var Xml in AllXmls)
+                {
+                    try
+                    {
+                        TxtHandleProcess(Xml.ToString());
+                        File.Delete(Xml.ToString());
+                    }
+                    catch (Exception ex)
+                    {
+
+                    }
+                }
+            }
         }
 
         private void CleanFolderPath_Click(object sender, EventArgs e)

+ 10 - 5
FileWatcher/DataHelper.cs

@@ -32,14 +32,19 @@ namespace FileWatcher
         //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //KS
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        //用户选择的数据库的连接字符串
-        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        ////用户选择的数据库的连接字符串
+        //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         ////ZZ
-        //private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.22.100.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.22.100.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //用户选择的数据库的连接字符串
+        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.22.100.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+
+        //private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=39.165.240.186)(PORT=61521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         ////用户选择的数据库的连接字符串
-        //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.22.100.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=39.165.240.186)(PORT=61521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+
 
         public static OracleConnection connection = null;
         OracleCommand command = null;

+ 1 - 1
FileWatcher/FileWatcher.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FileWatcher</RootNamespace>
     <AssemblyName>FileWatcher</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>

+ 2 - 4
FileWatcher/Program.cs

@@ -46,10 +46,8 @@ namespace FileWatcher
                 Application.SetCompatibleTextRenderingDefault(false);
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 {
-                    Application.Run(new UploadMakePlan());
-                    //Application.Run(new AutoMakeQTYRZ());
-                    //Application.Run(new AutoAnalysisXmlByStep());
-                    //Application.Run(new SOP_PNE("", ""));
+                    //Application.Run(new UploadMakePlan());
+                    Application.Run(new AutoAnalysisXmlByStep());
                     //Application.Run(new AutoMakeQTY());
                 }
                 else

+ 13 - 13
FileWatcher/packages.config

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Aspose.Cells" version="23.10.0" targetFramework="net40" />
-  <package id="ClosedXML" version="0.105.0" targetFramework="net48" />
-  <package id="ClosedXML.Parser" version="2.0.0" targetFramework="net48" />
-  <package id="DocumentFormat.OpenXml" version="3.1.1" targetFramework="net48" />
-  <package id="DocumentFormat.OpenXml.Framework" version="3.1.1" targetFramework="net48" />
-  <package id="EPPlus" version="8.0.5" targetFramework="net40" requireReinstallation="true" />
-  <package id="EPPlus.Interfaces" version="8.0.0" targetFramework="net40" requireReinstallation="true" />
+  <package id="ClosedXML" version="0.105.0" targetFramework="net48" requireReinstallation="true" />
+  <package id="ClosedXML.Parser" version="2.0.0" targetFramework="net48" requireReinstallation="true" />
+  <package id="DocumentFormat.OpenXml" version="3.1.1" targetFramework="net48" requireReinstallation="true" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.1.1" targetFramework="net48" requireReinstallation="true" />
+  <package id="EPPlus" version="8.0.5" targetFramework="net40" />
+  <package id="EPPlus.Interfaces" version="8.0.0" targetFramework="net40" />
   <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" />
-  <package id="RBush.Signed" version="4.0.0" targetFramework="net48" />
-  <package id="SixLabors.Fonts" version="1.0.0" targetFramework="net48" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" requireReinstallation="true" />
+  <package id="RBush.Signed" version="4.0.0" targetFramework="net48" requireReinstallation="true" />
+  <package id="SixLabors.Fonts" version="1.0.0" targetFramework="net48" requireReinstallation="true" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" requireReinstallation="true" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" requireReinstallation="true" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" requireReinstallation="true" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net48" requireReinstallation="true" />
 </packages>