From 140bb4a37bff593217f0e261f52603bbd5afc7a1 Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期日, 09 五月 2021 22:15:43 +0800
Subject: [PATCH] 1.调整一次读取并处理。(未完成)

---
 P066.Data/Form1.cs |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 95f58bb..cedec44 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -77,7 +77,6 @@
 
                 //璇诲彇鍏ㄩ儴琛ㄦ牸
             var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
-            List<ResultData> listSum = new List<ResultData>();
             var listAllSum = new List<ResultData>();
             List<Task> listTask = new List<Task>();
             var DataTipsort = new List<string>();
@@ -91,27 +90,39 @@
                 listTask.Add(task);
             }
             DataTipsort = readfile.TimeStamp(fileinfos1[0]);//璇诲彇涓�涓枃浠跺す鐨勬椂闂存埑
-            Task.WaitAll(listTask.ToArray());
+            Task.WaitAll(listTask.ToArray());//绛夊叏閮ㄨ鍙栧畬鍚庡啀杩涜涓嬩竴姝�
+            Dictionary<int, string> dictionary = new Dictionary<int, string>();
+            dictionary.Add(1, "鍒濇涓闀滃ご");
+            dictionary.Add(2, "澶嶆涓闀滃ご"); 
+            dictionary.Add(3, "鍒濇鑳屾澘闀滃ご");
+            dictionary.Add(4, "澶嶆鑳屾澘闀滃ご");
+            List<ResultData> listCompareSum = new List<ResultData>();
+            for (int j = 1; j < 5; j++)
+            {
+                int indexMax = j;
+                for (int i = 1; i < 5; i++)
+                {
+                    int index = i;
+                    Task task = Task.Run(() =>
+                    {
+                        listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "鐧界偣"),
+                                                            listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "鐧界偣"), DataTipsort));
+                    });
 
-
-
-
-
-
-
+                    listTask.Add(task);
+                }
+            }
             for (int i = 1; i < 5; i++)
             {
-                int index = i;
-                //Task task = Task.Run(() =>
-                //{
-                    listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "鍒濇涓闀滃ご" + i + "_" + 1 + "鐧界偣"),
-                       listAllSum.FindAll(a => a.FileName == "鍒濇涓闀滃ご" + i + "_" + 2 + "鐧界偣"), DataTipsort));
-                //});
+                int index = i;       
+                Task task = Task.Run(() =>
+                {
+                    listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 1 + "鍒櫧"),
+                                                        listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 2 + "鍒櫧"), DataTipsort));
+                });
 
-                //listTask.Add(task);
+                listTask.Add(task);
             }
-
-
 
             Task.WaitAll(listTask.ToArray());
 

--
Gitblit v1.8.0