1.merge

Administrator

2021-04-27 63993d30a95fcb678768ce3da82b8f01c99223c7

 P066.Data/Form1.cs

@@ -67,9 +67,66 @@

            
        }




        private void btnAnalyze_Click(object sender, EventArgs e)
        {
            var Start = DateTime.Now;

           

            //var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
            //List<ResultData> listSum1 = new List<ResultData>();
            //List<Task> listTask = new List<Task>();
            //for (int i = 0; i < fileinfos1.Count; i++)
            //{
            //    int index = i;
            //   var task= Task.Run(() => {

                    
            //       listSum1.AddRange(GetFileData(fileinfos1[index]));

            //    });
            //    listTask.Add(task);
            //}

            //var fileinfos2 = directoryInfo3.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
            //List<ResultData> listSum2 = new List<ResultData>();
 
            //for (int i = 0; i < fileinfos2.Count; i++)
            //{
            //    int index = i;
            //    var task = Task.Run(() => {


            //        listSum2.AddRange(GetFileData(fileinfos2[index]));

            //    });
            //    listTask.Add(task);
            //}


            //Task.WaitAll(listTask.ToArray());


            //List<string> str = new List<string>();
            //var listsumgrb = listSum2.GroupBy(a => a.FileName);
            //foreach (var item in listsumgrb)
            //{

            //    var tst = item.Key;
            //    str.Add(item.Key);

            //}







                var Start = DateTime.Now;
            #region 读取文件夹下的所有文件，并将文件按照上下进行区分;上表格为fileInfo1，下表格为fileInfo2
            List<FileInfo> fileInfo1 = new List<FileInfo>();
            List<FileInfo> fileInfo2 = new List<FileInfo>();
@@ -97,8 +154,7 @@
            var ListReexaminationSum = new List<ResultData>();          //复检报表数据
            var ListPreliminarySum = new List<ResultData>();          //初检报表数据
            string filenameDir = "";
            int ScratchI = 0;
            int ZoomI = 0;

            #region 读取一个表格中所有时间戳并排序
            var dataList = GetFileData(fileInfo1[0]); 
            var dataGroup = dataList.GroupBy(a => a.TimeTip);
@@ -970,27 +1026,15 @@
        private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
        {
            List<ResultData> ListReexaminationSum = new List<ResultData>();
            int WhiteI = 0;
            int WhiteningI = 0;
            List<Task> listTask = new List<Task>();
            for (int i = 0; i < fileInfo1.Count; i++)
            {
                int index = i;
                Task task = new Task(() => {
                    var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
                    //if (fileInfo1[index].Name.Contains("白点"))
                    //{
                        //WhiteI++;
                        //list.ForEach(a => a.Lensnumber = WhiteI);
                   
                        ListReexaminationSum.AddRange(list);
                    //}
                    //else if (fileInfo1[index].Name.Contains("刮白"))
                    //{
                        //WhiteningI++;
                        //list.ForEach(a => a.Lensnumber = WhiteningI);
                        //ListReexaminationSum.AddRange(list);

                    //}
                    if (fileInfo1[index].Name.Contains("初检中框"))
                    {
                        list = GetMidLocation(list);