From 63993d30a95fcb678768ce3da82b8f01c99223c7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期二, 27 四月 2021 19:46:45 +0800
Subject: [PATCH] 1.merge
---
P066.Data/Form1.cs | 289 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 240 insertions(+), 49 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index b84b654..4863333 100644
--- a/P066.Data/Form1.cs
+++ b/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锛屼笅琛ㄦ牸涓篺ileInfo2
List<FileInfo> fileInfo1 = new List<FileInfo>();
List<FileInfo> fileInfo2 = new List<FileInfo>();
@@ -97,18 +154,34 @@
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);
- var DataTipsor = new List<string>();
+ var DataTipsor = new List<string>(); //鐧藉鐝�绘椂闂存埑
+ var DataNightTipsor = new List<string>(); //澶滅彮鏃堕棿鎴�
+ var DataDayTipsor = new List<string>(); //鐧藉ぉ鏃堕棿鎴�
+
+
foreach (var item in dataGroup)
{
+ int.TryParse(item.Key, out int start);
DataTipsor.Add(item.Key);
+ if (start > 80000)
+ {
+ DataDayTipsor.Add(item.Key);
+ }
+ else
+ {
+ DataNightTipsor.Add(item.Key);
+ }
}
- DataTipsor = DataTipsor.Distinct().ToList();
- DataTipsor.Sort();
+ DataTipsor.Distinct().ToList().Sort();
+ DataDayTipsor.Distinct().ToList().Sort();
+ DataNightTipsor.Distinct().ToList().Sort();
+
+
+
#endregion
#region 璇诲彇鍒掍激銆侀晙鑶滅牬鎹熸枃浠跺す鏂囦欢
@@ -141,35 +214,65 @@
#endregion
var tt1 =DateTime.Now;
- var task2= Task.Run (() =>
+ var taskReexamination = Task.Run (() =>
{
-
- ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ //澶嶆鎶ヨ〃
+ ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
});
- var task3= Task.Run(() =>
+ var taskPreliminary = Task.Run(() =>
{
-
+ //鍒濇鎶ヨ〃
ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
});
-
- //Task.WaitAll(task2, task3);
- task2.Wait();
- var task5 = Task.Run(() =>
+ taskReexamination.Wait();
+
+
+
+
+
+
+ //澶滅彮
+ var taskNight= Task.Run(() =>
{
- #region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
+ #region//灏嗗鐝澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
//ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
- var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧鍒ゆ柇缁撴灉"}.csv";
+ var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "澶滅彮璁惧鍒ゆ柇缁撴灉"}.csv";
File.AppendAllText(file12, title12, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
- foreach (var item in DataTipsor)
+ foreach (var item in DataNightTipsor)
+ {
+ var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
+ writefile.WriteJR(Lens1, item, 1, file12);
+ for (int i = 2; i < 5; i++)
+ {
+ var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
+ writefile.WriteJR(Lens, "", i, file12);
+ }
+
+ }
+ #endregion
+
+
+ });
+ //鐧界彮
+ var taskDay = Task.Run(() =>
+ {
+
+ #region//灏嗗鐝澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
+ var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "鐧界彮鐝澶囧垽鏂粨鏋�"}.csv";
+ File.AppendAllText(file12, title12, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ foreach (var item in DataDayTipsor)
{
var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
writefile.WriteJR(Lens1, item, 1, file12);
@@ -185,18 +288,18 @@
});
- List<string> listPicyreSor = new List<string>(); //鍔犺浇鍥剧墖鏃堕棿鎴�
- var directoties = directoryInfo4.GetDirectories();
- for (int i = 0; i < directoties.Length; i++)
- {
- listPicyreSor.Add(directoties[i].Name);
- }
- listPicyreSor.Sort();
- if (listPicyreSor.Count!=0)
+ if (directoryInfo4!=null)
{
Task.Run(() =>
{
+ List<string> listPicyreSor = new List<string>(); //鍔犺浇鍥剧墖鏃堕棿鎴�
+ var directoties = directoryInfo4.GetDirectories();
+ for (int i = 0; i < directoties.Length; i++)
+ {
+ listPicyreSor.Add(directoties[i].Name);
+ }
+ listPicyreSor.Sort();
#region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
//ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
@@ -219,8 +322,8 @@
});
+
}
-
@@ -228,23 +331,26 @@
- task3.Wait();
+
+ taskPreliminary.Wait();
+
+
var task6 = Task.Run(() =>
{
#region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
if (directoryInfo3 != null)
{
- //GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3鍒濇涓婃枃浠跺す锛宖ileInfo4鍒濇涓嬫枃浠跺す
- //ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
List<ResultData> ListNoClearNub = new List<ResultData>(); //娓呴櫎澶辫触鏁�
List<ResultData> ListMayNub = new List<ResultData>(); //澶嶆澶氭鍑烘暟鏁�
- CompareFile2(ListReexaminationSum, ListPreliminarySum, DataTipsor, out ListNoClearNub, out ListMayNub);
+ CompareFile2(ListReexaminationSum, ListPreliminarySum, DataNightTipsor, out ListNoClearNub, out ListMayNub);
var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,鏈竻闄ゆ暟,澶嶆澶氭鍑烘暟";
- var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "澶滅彮缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
File.AppendAllText(file, title, Encoding.UTF8);
File.AppendAllText(file, "\r\n");
- foreach (var item in DataTipsor)
+
+ #region 澶滅彮
+ foreach (var item in DataNightTipsor)
{
//鎬荤己闄锋暟
var ListLenSum1 = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
@@ -281,7 +387,7 @@
}
}
var title1 = $"闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,娓呴櫎鐜�";
- var file1 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ var file1 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "澶滅彮缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
File.AppendAllText(file1, title1, Encoding.UTF8);
File.AppendAllText(file1, "\r\n");
for (int i =1; i < 5; i++)
@@ -304,16 +410,113 @@
File.AppendAllText(file1, content1, Encoding.UTF8);
File.AppendAllText(file1, "\r\n");
}
-
+ #endregion
directoryInfo3 = null;
}
#endregion
+
+
+
+
});
- Task.WaitAll(new Task[]{ task5, task6});
+ var task7 = Task.Run(() =>
+ {
+
+ #region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
+ if (directoryInfo3 != null)
+ {
+ List<ResultData> ListNoClearNub = new List<ResultData>(); //娓呴櫎澶辫触鏁�
+ List<ResultData> ListMayNub = new List<ResultData>(); //澶嶆澶氭鍑烘暟鏁�
+ CompareFile2(ListReexaminationSum, ListPreliminarySum, DataDayTipsor, out ListNoClearNub, out ListMayNub);
+ var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,鏈竻闄ゆ暟,澶嶆澶氭鍑烘暟";
+ var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "鐧界彮缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ File.AppendAllText(file, title, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+
+ #region 澶滅彮
+ foreach (var item in DataDayTipsor)
+ {
+ //鎬荤己闄锋暟
+ var ListLenSum1 = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum1 = ListLenSum1.Count;
+ //鏈竻闄ゆ暟
+ var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum1 = ListLenNoClearSum1.Count;
+ //璁惧娓呴櫎鏁�
+ var listlenclearsum1 = listlensum1 - listlennoclearsum1;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum1 = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum1 = ListLenMaySum1.Count;
+
+ var content1 = $"{item},{1},{listlensum1},{listlenclearsum1},{listlennoclearsum1},{listlenmaysum1}";
+ File.AppendAllText(file, content1, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+
+ for (int i = 2; i < 5; i++)
+ {
+ //鎬荤己闄锋暟
+ var ListLenSum = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum = ListLenSum.Count;
+ //鏈竻闄ゆ暟
+ var ListLenNoClearSum = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum = ListLenNoClearSum.Count;
+ //璁惧娓呴櫎鏁�
+ var listlenclearsum = listlensum - listlennoclearsum;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum = ListLenMaySum.Count;
+ var content = $"{""},{i},{listlensum},{listlenclearsum},{listlennoclearsum},{listlenmaysum}";
+ File.AppendAllText(file, content, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+ }
+ }
+ var title1 = $"闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,娓呴櫎鐜�";
+ var file1 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "鐧界彮缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ File.AppendAllText(file1, title1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ for (int i = 1; i < 5; i++)
+ {
+ //鍒濇缂洪櫡鏁�
+ var ListLenSum1 = ListPreliminarySum.FindAll(a => a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum1 = ListLenSum1.Count;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum1 = ListMayNub.FindAll(a => a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum1 = ListLenMaySum1.Count;
+ //鎬荤己闄锋暟
+ var defectSum = listlenmaysum1 + listlensum1;
+ //闄ゅ皹鏁�
+ var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum1 = ListLenNoClearSum1.Count;
+ var defectClearSum = listlensum1 - listlennoclearsum1;
+
+
+ var content1 = $"{i},{defectSum},{defectClearSum},{(double)(defectSum / defectClearSum)}";
+ File.AppendAllText(file1, content1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ }
+ #endregion
+
+ directoryInfo3 = null;
+ }
+
+ #endregion
+
+
+
+
+ });
+
+
+
+
+
+
+
+ Task.WaitAll(new Task[]{ taskNight, taskDay, task6, task7 });
@@ -823,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);
--
Gitblit v1.8.0