Clear Binaries

Clear binaries and start create logger

DataClients/FileClient.cs

@@ -10,11 +10,11 @@ namespace DataClients
 {
 	public class FileClient
 	{
-		//private char split = '/';
-    private char split = '\\';
-		private string dir = @"Y:\data";
+		private char split = '/';
+    //private char split = '\\';
+		//private string dir = @"Y:\data";
 		//private string dir = @"C:\data";
-		//private string dir = @"/archive_rmt/data";
+		private string dir = @"/archive_rmt/data";
 
 		public FileClient()
 		{

DataClients/STPClient.cs

@@ -23,11 +23,28 @@ namespace DataClients
 		{
 			var result = new Pasport();
 			var arr = new List<byte>();
+			var count_error = 0;
+			var flag_err = false;
+			do
 			{
-				var tmp = netClient.SocketWork(NetClient.Cmd.pasp_download, link);
-				foreach (var e in tmp) arr.AddRange(e);
-			}
-			result.byteArr = arr.ToArray();
+				flag_err = false;
+				result = new Pasport();
+				arr = new List<byte>();
+				try
+				{
+					{
+						var tmp = netClient.SocketWork(NetClient.Cmd.pasp_download, link);
+						foreach (var e in tmp) arr.AddRange(e);
+					}
+					result.byteArr = arr.ToArray();
+				}
+				catch
+				{
+					flag_err = true;
+					count_error++;
+					Thread.Sleep(3000);
+				}
+			} while (flag_err && count_error < 3);
 			return result;
 		}
 		public Tuple<string, string>[] GetListPasport(DateTime date)

DataClients/bin/Debug/netstandard2.0/DataClients.deps.json

@@ -1,97 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETStandard,Version=v2.0/",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETStandard,Version=v2.0": {},
-    ".NETStandard,Version=v2.0/": {
-      "DataClients/1.0.0": {
-        "dependencies": {
-          "NETStandard.Library": "2.0.3",
-          "SharpZipLib": "1.2.0",
-          "System.Text.Encoding.CodePages": "4.7.1"
-        },
-        "runtime": {
-          "DataClients.dll": {}
-        }
-      },
-      "Microsoft.NETCore.Platforms/1.1.0": {},
-      "NETStandard.Library/2.0.3": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
-      },
-      "SharpZipLib/1.2.0": {
-        "runtime": {
-          "lib/netstandard2.0/ICSharpCode.SharpZipLib.dll": {
-            "assemblyVersion": "1.2.0.246",
-            "fileVersion": "1.2.0.246"
-          }
-        }
-      },
-      "System.Runtime.CompilerServices.Unsafe/4.7.1": {
-        "runtime": {
-          "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {
-            "assemblyVersion": "4.0.6.0",
-            "fileVersion": "4.700.20.12001"
-          }
-        }
-      },
-      "System.Text.Encoding.CodePages/4.7.1": {
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.7.1"
-        },
-        "runtime": {
-          "lib/netstandard2.0/System.Text.Encoding.CodePages.dll": {
-            "assemblyVersion": "4.1.3.0",
-            "fileVersion": "4.700.20.21406"
-          }
-        }
-      }
-    }
-  },
-  "libraries": {
-    "DataClients/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.NETCore.Platforms/1.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
-      "path": "microsoft.netcore.platforms/1.1.0",
-      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
-    },
-    "NETStandard.Library/2.0.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "path": "netstandard.library/2.0.3",
-      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
-    },
-    "SharpZipLib/1.2.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-zvWa/L02JHNatdtjya6Swpudb2YEHaOLHL1eRrqpjm71iGRNUNONO5adUF/9CHbSJbzhELW1UoH4NGy7n7+3bQ==",
-      "path": "sharpziplib/1.2.0",
-      "hashPath": "sharpziplib.1.2.0.nupkg.sha512"
-    },
-    "System.Runtime.CompilerServices.Unsafe/4.7.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-zOHkQmzPCn5zm/BH+cxC1XbUS3P4Yoi3xzW7eRgVpDR2tPGSzyMZ17Ig1iRkfJuY0nhxkQQde8pgePNiA7z7TQ==",
-      "path": "system.runtime.compilerservices.unsafe/4.7.1",
-      "hashPath": "system.runtime.compilerservices.unsafe.4.7.1.nupkg.sha512"
-    },
-    "System.Text.Encoding.CodePages/4.7.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-i2fOvznVVgOOTLUz8FgSap/MsR98I4Iaoz99VXcOW/e7Y2OdY42zhYpBYpZyivk5alYY/UsOWAVswhtjxceodA==",
-      "path": "system.text.encoding.codepages/4.7.1",
-      "hashPath": "system.text.encoding.codepages.4.7.1.nupkg.sha512"
-    }
-  }
-}

DataClients/bin/Debug/netstandard2.0/STPClient.deps.json

@@ -1,47 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETStandard,Version=v2.0/",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETStandard,Version=v2.0": {},
-    ".NETStandard,Version=v2.0/": {
-      "STPClient/1.0.0": {
-        "dependencies": {
-          "NETStandard.Library": "2.0.3"
-        },
-        "runtime": {
-          "STPClient.dll": {}
-        }
-      },
-      "Microsoft.NETCore.Platforms/1.1.0": {},
-      "NETStandard.Library/2.0.3": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
-      }
-    }
-  },
-  "libraries": {
-    "STPClient/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.NETCore.Platforms/1.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
-      "path": "microsoft.netcore.platforms/1.1.0",
-      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
-    },
-    "NETStandard.Library/2.0.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "path": "netstandard.library/2.0.3",
-      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
-    }
-  }
-}

DataClients/obj/DataClients.csproj.nuget.dgspec.json

@@ -68,7 +68,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

DataClients/obj/project.assets.json

@@ -373,7 +373,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

DataClients/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "HcEcTEFqK4NguLdc9n2oVWS6UDiCCisPrshFq2CupkRvv5hBmPda9OVQoJIzeZEdi+2U4gtyC3VWS0arGt4GMg==",
+  "dgSpecHash": "7BT9QmMgOwS6t99cv7fCXOBzEuqVwmhl2HP4ljC3vr6o2Uq2GZQULmiLXAJ9NJ7T4nDLaRlmIbUCNZp+mmA0Dw==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj",
   "expectedPackageFiles": [

Mailing/NTC1.cs

@@ -0,0 +1,86 @@
+using DataClients;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+using PdfSharp.Drawing;
+using PdfSharp.Fonts;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Mailing
+{
+	public static class GenNTC1
+	{
+    public static void GetNTC1(DateTime datestart, DateTime dateend)
+		{
+      var w = new STPClient();
+      var s = datestart;
+      var e = dateend;
+      var r1 = new List<Tuple<string, string>>();
+      var r2 = new List<Pasport>();
+
+      for (var i = s; i < e; i = i.AddDays(1))
+      {
+        Console.WriteLine(i.ToString(@"yyyy.MM.dd"));
+        var a = w.GetListPasport(i);
+        foreach (var b in a)
+        {
+          Console.WriteLine(b.Item1.ToString() + " | " + b.Item2.ToString());
+
+          var c = w.GetPasport(b.Item2);
+          var d = w.GetIshData(c.time_start, c.time_end, c.numVDP);
+          var flag = false;
+          foreach (var f in d)
+          {
+            if (f.id != 0) continue;
+            //Console.Write(f.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' + b.Item1 + '\t' + f.value);
+            Regex r = new Regex(@"(\w*)-(\w{3})-32-031(\w*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            //Console.WriteLine('\t' + r.IsMatch(f.value).ToString());
+            flag = flag || r.IsMatch(f.value);
+          }
+          if (flag)
+          {
+            r1.Add(b); r2.Add(c);
+            /*Console.WriteLine(b.Item1 + '\t' +
+              c.time_start.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' +
+              c.time_end.ToString(@"yyyy.MM.dd HH:mm:ss.ff"));*/
+            /*foreach (var f in d)
+            {
+              if (f.id != 0) continue;
+              Console.WriteLine(f.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' + f.value);
+            }*/
+          }
+        }
+      }
+      Console.WriteLine("Write To File.");
+      Directory.CreateDirectory(Directory.GetCurrentDirectory() + '/' + "NTC1");
+      for (var i = 0; i < r1.Count; i++)
+      {
+        var a = w.GetProtectData(r2[i].time_start, r2[i].time_end, r2[i].numVDP);
+        var b = new List<Protect>();
+        foreach (var c in a)
+          if (c.id == 72) b.Add(c);
+        if (b.Count > 0)
+        {
+          var fs = new StreamWriter(Directory.GetCurrentDirectory() + "/NTC1/" + s.ToString(@"yyyyMMdd") + "-" + e.ToString(@"yyyyMMdd") + ".txt", true);
+          /*Console.WriteLine(r1[i].Item1 + '\t' +
+            r2[i].time_start.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' +
+            r2[i].time_end.ToString(@"yyyy.MM.dd HH:mm:ss.ff"));*/
+          fs.WriteLine(r1[i].Item1 + '\t' +
+            r2[i].time_start.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' +
+            r2[i].time_end.ToString(@"yyyy.MM.dd HH:mm:ss.ff"));
+          foreach (var d in b)
+          {
+            /*Console.WriteLine(d.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' + d.id.ToString("D2") + '\t' + d.value);*/
+            fs.WriteLine(d.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + '\t' + d.value);
+          }
+          fs.Close();
+        }
+      }
+    }
+  }
+}

Mailing/Program.cs

@@ -14,7 +14,10 @@ namespace Mailing
 		static void Main(string[] args)
 		{
 			if (args.Length < 1)
+			{
 				Console.WriteLine("Need params.");
+				return;
+			}
 			var mailList = new List<string>();
 			{
 				var strings = File.ReadAllLines(args.Last());
@@ -61,11 +64,48 @@ namespace Mailing
 						}
 					}
 					GenSZO.GetPDF(time);
-					var file = Directory.GetCurrentDirectory() + "/" + time.ToString("yyyy-MM-dd") + ".pdf";
+					var fileszo = Directory.GetCurrentDirectory() + "/SZO/" + time.ToString("yyyy-MM-dd") + ".pdf";
 					foreach (var e in mailList)
-						Mailing.SendMail(new MailAddress(e), file);
+						Mailing.SendMail(new MailAddress(e), fileszo);
 				break;
-				
+				case "NTC1":
+					if (args.Length != 4)
+					{
+						Console.WriteLine("Wrong format");
+						Console.WriteLine("Example: Maling NTC1 2020.07.07 2020.07.14 /mail.list");
+						return;
+					}
+
+					var timestart = DateTime.Now.AddDays(-7);
+					var timeend = DateTime.Now;
+					{
+						try
+						{
+							var s = args[1].Split('.');
+							timestart = new DateTime(
+								Convert.ToInt32(s[0]),
+								Convert.ToInt32(s[1]),
+								Convert.ToInt32(s[2]));
+
+							s = args[2].Split('.');
+							timeend = new DateTime(
+								Convert.ToInt32(s[0]),
+								Convert.ToInt32(s[1]),
+								Convert.ToInt32(s[2]));
+						}
+						catch
+						{
+							Console.WriteLine("Wrong format data");
+							Console.WriteLine("Example: 2020.07.14");
+							return;
+						}
+					}
+					GenNTC1.GetNTC1(timestart, timeend);
+					var filentc1 = Directory.GetCurrentDirectory() + "/NTC1/" + timestart.ToString(@"yyyyMMdd") + "-" + timeend.ToString(@"yyyyMMdd") + ".txt";
+					foreach (var e in mailList)
+						Mailing.SendMailNTC1(new MailAddress(e), filentc1);
+					break;
+
 			}
 		}
 	}
@@ -87,5 +127,27 @@ namespace Mailing
 			Smtp.Send(m);
 
 		}
+		public static void SendMailNTC1(MailAddress to, string file)
+		{
+			MailMessage m = new MailMessage(From, to)
+			{
+				Subject = "Список плавок с низской скоростью штока",
+				Body = "Еженедельная рассылка списка плавок " +
+				"с низкой скоростью штока."
+		};
+			try
+			{
+				m.Attachments.Add(new Attachment(file));
+			}
+			catch
+			{
+				m.Body = m.Body + "\n В заданный период времени не было найдено подходящих плавок.";
+				Console.WriteLine("Отсутствует файл для отправки.");
+			}
+			finally
+			{
+				Smtp.Send(m);
+			}
+		}
 	}
 }

Mailing/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Mailing": {
       "commandName": "Project",
-      "commandLineArgs": "SZO 2020.08.28 F:\\Projects1\\Mailing\\bin\\Debug\\netcoreapp3.1\\mailing_SZO.list"
+      "commandLineArgs": "NTC1 2020.07.22 2020.10.09 D:\\GIT\\ASCKU_PC\\Mailing\\bin\\Debug\\netcoreapp3.1\\mailing_NTC1.list"
     }
   }
 }

Mailing/SZO.cs

@@ -79,16 +79,16 @@ namespace Mailing
 							var t2 = d.Item1 > e.end ? e.end : d.Item1;
               var res = t2 - t1;
               currstat = d;
-              if (chk1.Contains((int)e.index) && res.TotalMinutes < 15)
+              if (res.TotalMinutes < 15)
                 continue;
 							if (!resFull.ContainsKey(i))
 								resFull.Add(i, new List<SZOWork>());
-							resFull[i].Add(new SZOWork()
-							{
-								oper = e.index,
-								techCycleStart = e.start,
-								WorkTime = res
-							});
+              resFull[i].Add(new SZOWork()
+              {
+                oper = e.index,
+                techCycleStart = e.start,
+                WorkTime = res.Subtract(new TimeSpan(00, 15, 00))
+              });
 						}
 						currstat = d;
 					}
@@ -203,7 +203,8 @@ namespace Mailing
 
     public static void Print(DateTime time)
     {
-      var file = Directory.GetCurrentDirectory() + '/' + time.ToString("yyyy-MM-dd") + ".pdf";
+      Directory.CreateDirectory(Directory.GetCurrentDirectory() + '/' + "SZO");
+      var file = Directory.GetCurrentDirectory() + '/' + "SZO" + '/' + time.ToString("yyyy-MM-dd") + ".pdf";
       if (File.Exists(file))
         File.Delete(file);
       var pdfRenderer = new PdfDocumentRenderer(true) { Document = doc };

Mailing/bin/Debug/netcoreapp3.1/NTC1/20200722-20201009.txt

@@ -0,0 +1,27 @@
+9-34-09660	2020.07.28 03:46:45.00	2020.07.28 17:52:06.00
+2020.07.28 10:59:08.08	1
+2020.07.28 15:59:50.47	0
+9-35-09607	2020.08.07 23:01:25.00	2020.08.08 17:06:56.00
+2020.08.08 11:43:11.08	1
+2020.08.08 15:19:57.95	0
+9-39-09484	2020.08.17 22:57:38.00	2020.08.18 15:43:11.00
+2020.08.18 07:28:02.10	1
+2020.08.18 13:53:53.48	0
+9-35-09621	2020.08.19 05:19:14.00	2020.08.19 21:56:11.00
+2020.08.19 14:22:07.15	1
+2020.08.19 20:09:50.22	0
+9-02-05210	2020.08.26 01:34:35.00	2020.08.26 13:03:29.00
+2020.08.26 05:25:30.08	1
+2020.08.26 11:09:50.92	0
+9-35-09641	2020.09.04 09:46:24.00	2020.09.05 03:10:27.00
+2020.09.04 19:58:29.12	1
+2020.09.05 01:24:40.76	0
+9-45-11544	2020.09.09 02:55:02.00	2020.09.10 01:30:59.00
+2020.09.09 18:38:06.97	1
+2020.09.09 23:41:17.67	0
+9-10-11235	2020.09.10 07:09:31.00	2020.09.11 01:56:32.00
+2020.09.10 18:22:25.17	1
+2020.09.11 00:04:03.86	0
+9-04-10138	2020.09.27 16:45:11.00	2020.09.28 08:19:21.00
+2020.09.28 00:05:40.15	1
+2020.09.28 06:22:32.82	0

Mailing/bin/Debug/netcoreapp3.1/mailing_NTC1.list

@@ -0,0 +1 @@
+hatuncev_gd@vsmpo.ru

Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-b02eda345f31d2d14534071229c79baee93aee8f
+e79626e0af92f8b473bc98f42f0bd95f726cf733

Mailing/obj/Mailing.csproj.nuget.dgspec.json

@@ -68,7 +68,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -144,7 +144,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -208,7 +208,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -282,7 +282,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -350,7 +350,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -414,7 +414,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

Mailing/obj/project.assets.json

@@ -393,7 +393,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

Mailing/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "JhSZzmYttQLpb/GGrRG41X411bHVP6MsnlK+LD7MbGjC4ML7JSnnlOUo1fQ8WpRLIvwvQfNev2CRVWlrJqdJXQ==",
+  "dgSpecHash": "SpajZEf7/VRQUrDXoiTHU8aXoyHn3smrZZdD0UCJW8X2gPLouW0OsXdBb8ylFplsopwQkajR3U66biGjk4fcOQ==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj",
   "expectedPackageFiles": [

MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json

@@ -64,7 +64,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

MigraDoc.DocumentObjectModel/obj/project.assets.json

@@ -286,7 +286,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

MigraDoc.DocumentObjectModel/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "cHrH2fmRrM7xlORB7qRsrFcbUxFMw9i2snsz2hUdZxu8bOzA9DCCL9gksbqI5FYEQ6kK0h0Nv/ohzPIqQnqiIg==",
+  "dgSpecHash": "sMVC5tTwmw8lVKozaFc9wZng6+eIaBDkkcP9M4h/5k7RH5l06x70uvI4d8/E9a3MgwLAXZYzb3au0VD8ujhlvQ==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj",
   "expectedPackageFiles": [

MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json

@@ -64,7 +64,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -138,7 +138,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -206,7 +206,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -270,7 +270,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

MigraDoc.Rendering/obj/project.assets.json

@@ -354,7 +354,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

MigraDoc.Rendering/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "JapflX0cFjqZDaIm7qe88mctAZS3Gv7cpxKUKsfG3bbsxfQvT/+t1ilsYpYNVws3DwdyHFUxxR7lBRMSICakBA==",
+  "dgSpecHash": "/DiFUq9jrVyRqg4UMqGnZ2+JyPbuesXTB1NiRdiuJv4oog80hdJoxYweU30+bRSdERXlW7dMIA529AvWOLD6oQ==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj",
   "expectedPackageFiles": [

PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json

@@ -68,7 +68,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -132,7 +132,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

PdfSharp.Charting/obj/project.assets.json

@@ -309,7 +309,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

PdfSharp.Charting/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "sXRMPBVLc68hrYRk83qFzdRSzOswVsm/i1ZjSJpS5L4p8lbgV1tQu/plV4JS7HCQ5fctSgSsvgJixjQ/Dxr6pQ==",
+  "dgSpecHash": "mtTcbA6JrSdkRZ7OA+eTSV2m6IUDmY43Gtb1J7ttpur+mVFOhCXZDUCW+3836slhlzX4IBgq/yYNx5B5p8r0Bg==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\PdfSharp.Charting\\PdfSharp.Charting.csproj",
   "expectedPackageFiles": [

PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json

@@ -64,7 +64,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

PdfSharp/obj/project.assets.json

@@ -286,7 +286,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

PdfSharp/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "hsQc3BnmnU2glWh5XgXHVp3newo1LGnRJJq6awWrqy7iFA39Y7riSW0nYZBWBhCb3pi1uJD8RgeC6PUP5l85KQ==",
+  "dgSpecHash": "OHQOcDGAzu4KEGuXNSw89S5Vb0e42R4KfOE8UVOQfEHhKXZVl5IhScP4ErSDJBdtHfWKxBoO6i1cjPcez+nB0Q==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\PdfSharp\\PdfSharp.csproj",
   "expectedPackageFiles": [

Projects.sln

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigraDoc.Rendering", "Migra
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigraDoc.DocumentObjectModel", "MigraDoc.DocumentObjectModel\MigraDoc.DocumentObjectModel.csproj", "{C873319A-89FB-4F7E-BD72-F9BCC147E08A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportClasses", "SupportClasses\SupportClasses.csproj", "{4494877D-DAA5-4498-BA09-6001E9371D4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SupportClasses", "SupportClasses\SupportClasses.csproj", "{4494877D-DAA5-4498-BA09-6001E9371D4B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

SupportClasses/Logger.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SupportClasses
+{
+	public static class Logger
+	{
+		public enum Level { info,}
+	}
+}

SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.FileListAbsolute.txt

@@ -7,3 +7,12 @@ F:\Projects1\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.AssemblyInfo
 F:\Projects1\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.csproj.CoreCompileInputs.cache
 F:\Projects1\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.dll
 F:\Projects1\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.pdb
+D:\GIT\ASCKU_PC\SupportClasses\bin\Debug\netstandard2.0\SupportClasses.deps.json
+D:\GIT\ASCKU_PC\SupportClasses\bin\Debug\netstandard2.0\SupportClasses.dll
+D:\GIT\ASCKU_PC\SupportClasses\bin\Debug\netstandard2.0\SupportClasses.pdb
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.csprojAssemblyReference.cache
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.AssemblyInfoInputs.cache
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.AssemblyInfo.cs
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.csproj.CoreCompileInputs.cache
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.dll
+D:\GIT\ASCKU_PC\SupportClasses\obj\Debug\netstandard2.0\SupportClasses.pdb

SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json

@@ -60,7 +60,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
         }
       }
     }

SupportClasses/obj/project.assets.json

@@ -239,7 +239,7 @@
         ],
         "assetTargetFallback": true,
         "warn": true,
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.403\\RuntimeIdentifierGraph.json"
       }
     }
   }

SupportClasses/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "GYufEKHPXelIIVzPdQ3HP6B9x8s3gLkPKWRYHUCi0LFmg2a/B1DDCz3ET+8D37bbYS5HAZOEKSYwcub2G+maLA==",
+  "dgSpecHash": "jCFt4cuNeVfEUX5ogDbZ1IvTDLb9tU+NYDX78HdQOqxatku1fx/RJbu4FgJxkufoTk/hoeVn1l8Z56imb74+7g==",
   "success": true,
   "projectFilePath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj",
   "expectedPackageFiles": [

Tests/Program.cs

@@ -11,13 +11,21 @@ using Mailing;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 
+public class CustomMath
+{
+	public static int multiplu(int a, int b)
+	{
+		return a * b;
+	}
+}
+
 namespace Tests
 {
 	class Program
 	{
 		static void Main(string[] args)
 		{
-			test8();
+			test9();
 		}
 		static void test1()
 		{
@@ -233,23 +241,31 @@ namespace Tests
 		static void test8()
 		{
 			var w = new STPClient();
-			var s = new DateTime(2020, 07, 1);
-			var e = new DateTime(2020, 09, 24);
-			var vdps = new int[] { 33 };
-
+			var s = new DateTime(2020, 09, 30);
+			var e = new DateTime(2020, 10, 03);
+			//var vdps = new int[] { 2, 3, 4, 10, 11, 12, 16, 21, 22, 23, 27, 31, 33, 36, 45 };
+			var vdps = new int[] { 3, 4, 21, 36 };
 			foreach (var vdp in vdps)
 			{
 				var a = w.GetProtectData(s, e, (ushort)vdp);
-				a = a.FindAll(x => x.id == 35);
+				a = a.FindAll(x => x.id == 35 || x.id == 70 || x.id == 71);
+				Console.WriteLine("VDP " + vdp.ToString("D2"));
 				foreach (var b in a)
 				{
+					Console.Write(b.id.ToString("D2") + " ");
 					Console.Write(b.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff"));
 					Console.WriteLine(" " + b.value.ToString("D2"));
 				}
 
 				var fs = new StreamWriter(Directory.GetCurrentDirectory() + '\\' + vdp.ToString("D2") + ".txt");
+				fs.WriteLine("35 - Отсутствует связь с контроллером ГМП");
+				fs.WriteLine("70 - Смещение начала архивации");
+				fs.WriteLine("70 - Смещение конца архивации");
+				fs.WriteLine();
+				fs.WriteLine("№ защиты \t Дата возникновения записи \t Состояние");
+				
 				foreach (var b in a)
-						fs.WriteLine(b.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + " " + b.value.ToString("D2"));
+						fs.WriteLine(b.id.ToString("D2") + "\t" + b.time.ToString(@"yyyy.MM.dd HH:mm:ss.ff") + "\t" + b.value.ToString("D2"));
 				fs.Close();
 			}
 		}
@@ -257,8 +273,8 @@ namespace Tests
 		static void test9()
 		{
 			var w = new STPClient();
-			var s = new DateTime(2020, 09, 24);
-			var e = new DateTime(2020, 09, 25);
+			var s = new DateTime(2020, 10, 05);
+			var e = new DateTime(2020, 10, 07);
 			var vdp = 1;
 
 			var a = w.GetProtectData(s, e, (ushort)vdp);

Tests/bin/Debug/netcoreapp3.1/03.txt

@@ -1,23 +0,0 @@
-2020.07.14 13:53:23.59 01
-2020.07.14 13:54:30.82 01
-2020.07.14 13:54:40.95 00
-2020.08.11 09:36:23.94 01
-2020.08.11 09:36:30.33 00
-2020.08.29 08:50:46.32 01
-2020.08.29 09:01:16.82 00
-2020.09.04 21:53:06.63 01
-2020.09.04 21:53:17.03 00
-2020.09.22 02:07:09.18 01
-2020.09.22 02:12:58.08 00
-2020.09.22 15:13:13.51 01
-2020.09.22 15:13:44.42 00
-2020.09.22 15:18:23.52 01
-2020.09.22 15:18:44.32 00
-2020.09.22 19:20:16.45 01
-2020.09.22 19:20:18.11 00
-2020.09.23 10:53:55.88 01
-2020.09.23 10:54:24.78 00
-2020.09.23 10:55:26.78 01
-2020.09.23 10:55:56.98 00
-2020.09.23 11:03:56.21 01
-2020.09.23 11:04:01.77 00

Tests/bin/Debug/netcoreapp3.1/04.txt

@@ -1,50 +0,0 @@
-2020.07.09 10:13:08.61 01
-2020.07.09 11:05:22.09 01
-2020.07.09 11:19:33.49 01
-2020.07.09 11:34:31.04 01
-2020.07.14 15:16:04.67 01
-2020.07.14 15:16:54.96 01
-2020.07.15 12:09:38.59 01
-2020.07.23 15:03:27.13 01
-2020.07.23 15:20:01.00 01
-2020.08.03 13:24:00.47 00
-2020.08.10 09:36:16.39 01
-2020.08.10 09:36:24.53 00
-2020.08.10 10:18:22.38 01
-2020.08.10 10:18:34.84 00
-2020.08.10 12:46:11.77 01
-2020.08.10 12:46:17.93 00
-2020.08.10 13:09:17.64 01
-2020.08.10 13:09:18.67 00
-2020.08.10 14:02:40.77 01
-2020.08.10 14:02:49.72 00
-2020.08.10 14:12:10.32 01
-2020.08.10 14:12:15.72 00
-2020.08.10 17:18:21.62 01
-2020.08.10 17:18:27.12 00
-2020.08.11 03:45:05.02 01
-2020.08.11 03:45:10.51 00
-2020.08.15 03:55:03.02 01
-2020.08.15 03:55:08.52 00
-2020.08.15 11:04:30.22 01
-2020.08.15 11:04:35.72 00
-2020.09.03 18:31:14.26 01
-2020.09.03 18:31:14.74 00
-2020.09.10 18:35:27.03 01
-2020.09.10 18:35:32.53 00
-2020.09.12 07:17:01.03 01
-2020.09.12 07:17:06.53 00
-2020.09.13 11:31:24.67 01
-2020.09.13 11:31:30.17 00
-2020.09.14 14:14:42.58 01
-2020.09.14 14:14:48.08 00
-2020.09.16 23:02:36.53 01
-2020.09.16 23:02:42.03 00
-2020.09.22 09:46:21.85 01
-2020.09.22 09:46:42.65 00
-2020.09.22 09:49:50.25 01
-2020.09.22 09:51:07.75 00
-2020.09.22 09:55:31.34 01
-2020.09.22 09:55:56.15 00
-2020.09.22 09:56:29.25 01
-2020.09.22 09:59:08.35 00