Jack.Peng
2021-05-08 85b87355fbeb07c0b5111ac4f62a8897699d221f
P066.Data/Form1.cs
@@ -80,44 +80,40 @@
            List<ResultData> listSum = new List<ResultData>();
            var listAllSum = new List<ResultData>();
            List<Task> listTask = new List<Task>();
            var DataTipsort = new List<string>();
            for (int i = 0; i < fileinfos1.Count; i++)
            {
                int index = i;
                var task = Task.Run(() =>
                {
                    listAllSum.AddRange(GetFileData(fileinfos1[index]));
                });
                listTask.Add(task);
            }
            DataTipsort = readfile.TimeStamp(fileinfos1[0]);//读取一个文件夹的时间戳
            Task.WaitAll(listTask.ToArray());
            var TipGrp = listAllSum.FindAll(a => a.FileName=="复检中框镜头1_1白点").GroupBy(a=>a.TimeTip);
            var DataTipsort = new List<string>();
            foreach (var item in TipGrp)
            {
                DataTipsort.Add(item.Key);
            }
            DataTipsort.Distinct().ToList().Sort();
            for (int i = 1; i < 5; i++)
            {
                int index = i;
                Task task = Task.Run(() => {
                    listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "初检中框镜头" + index + "_" + 1 + "白点"),
                       listAllSum.FindAll(a => a.FileName == "初检中框镜头" + index + "_" + 2 + "白点"), DataTipsort));
                });
                //Task task = Task.Run(() =>
                //{
                    listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "初检中框镜头" + i + "_" + 1 + "白点"),
                       listAllSum.FindAll(a => a.FileName == "初检中框镜头" + i + "_" + 2 + "白点"), DataTipsort));
                //});
                listTask.Add(task);
                //listTask.Add(task);
            }
             Task.WaitAll(listTask.ToArray());
            Task.WaitAll(listTask.ToArray());