diff --git a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 index f4206ff..ac53afe 100644 Binary files a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 and b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 0554a5f..2e0c839 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/ASCKU_PC.zip b/ASCKU_PC.zip new file mode 100644 index 0000000..bb178b3 Binary files /dev/null and b/ASCKU_PC.zip differ diff --git a/ApiServer/ApiServer.csproj b/ApiServer/ApiServer.csproj index f3b0ac7..22f0715 100644 --- a/ApiServer/ApiServer.csproj +++ b/ApiServer/ApiServer.csproj @@ -7,10 +7,17 @@ + + + + + + + diff --git a/ApiServer/ApiStruct/Date.cs b/ApiServer/ApiStruct/Date.cs new file mode 100644 index 0000000..dbe48a1 --- /dev/null +++ b/ApiServer/ApiStruct/Date.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Structures; +using ApiServer.Parametrs; + +namespace ApiServer.ApiStruct +{ + public class DateGetAnalogApi + { + public int Vdp { get; set; } + public int Index { get; set; } + public DateTime Start { get; set; } + public DateTime End { get; set; } + } + public class DateGetAnalogClient + { + public Analog[] Analog { get; set; } + } + + public class DateGetAnalogsApi + { + public int Vdp { get; set; } + public int[] Index { get; set; } + public DateTime Start { get; set; } + public DateTime End { get; set; } + } + public class DateGetAnalogsClient + { + public AnalogArr[] Analogs { get; set; } + } + + public class DateGetTechCycleApi + { + public DateTime Start { get; set; } + public DateTime End { get; set; } + public int Vdp { get; set; } + } + public class DateGetTechCycleClient + { + public TechCycle[] TechCycle { get; set; } + } + + public class DateGetProtectApi + { + public DateTime Start { get; set; } + public DateTime End { get; set; } + public int Vdp { get; set; } + } + public class DateGetProtectClient + { + public Protect[] Protect { get; set; } + } + + public class DateGetDiscretApi + { + public int Vdp { get; set; } + public DateTime Start { get; set; } + public DateTime End { get; set; } + } + public class DateGetDiscretClient + { + public Discret[] Discret { get; set; } + } + +} diff --git a/ApiServer/ApiStruct/Discret.cs b/ApiServer/ApiStruct/Discret.cs new file mode 100644 index 0000000..5f59e76 --- /dev/null +++ b/ApiServer/ApiStruct/Discret.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Structures; +using ApiServer.Parametrs; + +namespace ApiServer.ApiStruct +{ + public class DiscretGetiscretsMatrixApi + { + public DateTime Start { get; set; } + public DateTime End { get; set; } + public int Vdp { get; set; } + } + public class DiscretGetDscretsMatrixClient + { + public StateStruct[] StateParams { get; set; } + public DiscretParams[] DiscretParams { get; set; } + public DiscretMatrix[] Discrets { get; set; } + } + + public class DiscretGetiscretsApi + { + public DateTime Start { get; set; } + public DateTime End { get; set; } + public int Vdp { get; set; } + } + public class DiscretGetDscretsClient + { + public StateStruct[] StateParams { get; set; } + public DiscretParams[] DiscretParams { get; set; } + public Discret[] Discrets { get; set; } + } +} diff --git a/ApiServer/ApiStruct/Params.cs b/ApiServer/ApiStruct/Params.cs new file mode 100644 index 0000000..93d4e81 --- /dev/null +++ b/ApiServer/ApiStruct/Params.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Structures; +using ApiServer.Parametrs; + +namespace ApiServer.ApiStruct +{ + public class ParamsGetAnalogApi + { + public string Name { get; set; } + } + public class ParamsGetAnalogClient + { + public AnalogParams[] Analog_params { get; set; } + } + + public class ParamsGetMetricClient + { + public Metric[] Metrics { get; set; } + } + public class ParamsGetTechCycleNameClient + { + public TechCycleName[] Name { get; set; } + } + public class ParamsGetTechCycleColorClient + { + public TechCycleColor[] Color { get; set; } + } + + public class ParamsGetStateStructClient + { + public StateStruct[] StateStruct { get; set; } + } + + public class ParamsGetProtectStateApi + { + public string Name { get; set; } + } + public class ParamsGetProtectStateClient + { + public ProtectState[] ProtectState { get; set; } + } + + public class ParamsGetDiscretApi + { + public string Name { get; set; } + } + public class ParamsGetDiscretClient + { + public DiscretParams[] Discret_params { get; set; } + } + +} diff --git a/ApiServer/ApiStruct/Pasport.cs b/ApiServer/ApiStruct/Pasport.cs index 5cac2a0..b52a26f 100644 --- a/ApiServer/ApiStruct/Pasport.cs +++ b/ApiServer/ApiStruct/Pasport.cs @@ -34,5 +34,48 @@ namespace ApiServer.ApiStruct public class PasportGetListClient { public string[] Name { get; set; } + public string[] Time { get; set; } } + public class PasportGetPasportApi + { + public DateTime Date { get; set; } + public string Name { get; set; } + } + public class PasportGetPasportClient + { + public bool HasData { get; set; } + public byte? NumVDP { get; set; } + public string DStart { get; set; } + public string DEnd { get; set; } + + public bool HasPasport { get; set; } + public int Kod_npl { get; set; } + public string Nplav { get; set; } + public string Rm { get; set; } + public string Splav { get; set; } + public string IS { get; set; } + public ushort Notd { get; set; } + public ushort Vessl { get; set; } + public ushort Diam { get; set; } + public ushort Prpl { get; set; } + public string Tin { get; set; } + public string Dzap { get; set; } + public short Dlog { get; set; } + public short Last { get; set; } + public short Dlper { get; set; } + public string Nazn { get; set; } + public ushort Kompl { get; set; } + public ushort Izl { get; set; } + public float Robm { get; set; } + public float Rizol { get; set; } + public ushort Dkr { get; set; } + public string Nkon { get; set; } + public string Pos { get; set; } + public string Ukaz { get; set; } + public string Zakaz { get; set; } + public string Kat { get; set; } + public string Pril { get; set; } + public string Rezerved { get; set; } + } + } diff --git a/ApiServer/Config/Analog/all.json b/ApiServer/Config/Analog/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/Config/Analog/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/Config/Analog/default.json b/ApiServer/Config/Analog/default.json new file mode 100644 index 0000000..1935d69 --- /dev/null +++ b/ApiServer/Config/Analog/default.json @@ -0,0 +1,380 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Ток дуги", + "s_name": "I д", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 0, 1 ] + }, + { + "index": 1, + "name": "Напряжение дуги", + "s_name": "U д", + "metric": "В", + "mul": 0.1, + "show_default": true, + "bytes": [ 2, 3 ] + }, + { + "index": 2, + "name": "Ток рабочего двигателя", + "s_name": "I рд", + "metric": "А", + "mul": 0.1, + "bytes": [ 4, 5 ] + }, + { + "index": 3, + "name": "U рабочего двигателя", + "s_name": "U рд", + "metric": "В", + "mul": 0.1, + "bytes": [ 6, 7 ] + }, + { + "index": 4, + "name": "Ток соленоида", + "s_name": "I сол", + "metric": "А", + "mul": 0.1, + "bytes": [ 8, 9 ] + }, + { + "index": 5, + "name": "U соленоида", + "s_name": "U сол", + "metric": "В", + "mul": 0.1, + "bytes": [ 10, 11 ] + }, + { + "index": 6, + "name": "Ток задания", + "s_name": "I рз", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 12, 13 ] + }, + { + "index": 7, + "name": "t кристаллизатора на входе", + "s_name": "t кр.вых", + "metric": "гр.С", + "mul": 1, + "bytes": [ 14, 15 ] + }, + { + "index": 8, + "name": "t кристаллизатора на выходе", + "s_name": "t кр.вх", + "metric": "гр.С", + "mul": 1, + "bytes": [ 16, 17 ] + }, + { + "index": 9, + "name": "t вакуум-камеры", + "s_name": "t вак-кам", + "metric": "гр.С", + "mul": 1, + "bytes": [ 18, 19 ] + }, + { + "index": 10, + "name": "t штока", + "s_name": "t шт", + "metric": "гр.С", + "mul": 1, + "bytes": [ 20, 21 ] + }, + { + "index": 11, + "name": "U контроля", + "s_name": "U конт", + "metric": "В", + "mul": 0.1, + "bytes": [ 22, 23 ] + }, + { + "index": 12, + "name": "Перемещение", + "s_name": "S шт", + "metric": "мм", + "mul": 1, + "bytes": [ 24, 25 ] + }, + { + "index": 13, + "name": "Вакуум", + "s_name": "Вакуум", + "metric": "мкм.рт.ст", + "mul": 1, + "show_default": true, + "bytes": [ 26, 27 ] + }, + { + "index": 14, + "name": "Изоляция шток-крышка", + "s_name": "R шт-кр", + "metric": "В", + "mul": 0.1, + "bytes": [ 28, 29 ] + }, + { + "index": 15, + "name": "Изоляция крышка-камера", + "s_name": "R кр-кам", + "metric": "В", + "mul": 0.1, + "bytes": [ 30, 31 ] + }, + { + "index": 16, + "name": "Расход воды", + "s_name": "Q в.кр", + "metric": "м^3/ч", + "mul": 1, + "bytes": [ 32, 33 ] + }, + { + "index": 17, + "name": "Капельные замыкания", + "s_name": "Кап.зам.", + "metric": "УЕ", + "mul": 0.01, + "bytes": [ 34, 35 ] + }, + { + "index": 18, + "name": "Усреднённая ширина импульсов КЗ", + "s_name": "Кап.зым.", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 36, 37 ] + }, + { + "index": 19, + "name": "Проток воды фланца", + "s_name": "Qв. фл.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 38, 39 ] + }, + { + "index": 20, + "name": "Проток воды штока", + "s_name": "Qв. шт.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 40, 41 ] + }, + { + "index": 21, + "name": "Давление воды крист.+1,5", + "s_name": "P в.кр", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [ 42, 43 ] + }, + { + "index": 22, + "name": "Проток воды камеры", + "s_name": "Qв. кам.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 44, 45 ] + }, + { + "index": 23, + "name": "Ток задания источника(САУ)", + "s_name": "I з.ист САУ", + "metric": "кА", + "mul": 0.1, + "bytes": [ 58, 59 ] + }, + { + "index": 24, + "name": "", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 60, 61 ] + }, + { + "index": 25, + "name": "ПИД-рег. основная уставка", + "s_name": "ПИД-осн", + "metric": "В", + "mul": 0.1, + "bytes": [ 62, 63 ] + }, + { + "index": 26, + "name": "ПИД-рег. макс. скорость", + "s_name": "ПИД-макс", + "metric": "В", + "mul": 0.1, + "bytes": [ 64, 65 ] + }, + { + "index": 27, + "name": "t фланца вакуум-камеры", + "s_name": "t фл.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 66, 67 ] + }, + { + "index": 28, + "name": "t подставки", + "s_name": "t под.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 68, 69 ] + }, + { + "index": 29, + "name": "Проток воды подставки", + "s_name": "Qв. под.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 70, 71 ] + }, + { + "index": 30, + "name": "Задание соленоида", + "s_name": "Зад. сол.", + "metric": "А", + "mul": 0.1, + "bytes": [ 72, 73 ] + }, + { + "index": 31, + "name": "Ток задания источника(преобраз.)", + "s_name": "I з.ист. преоб.", + "metric": "кА", + "mul": 0.1, + "bytes": [ 74, 75 ] + }, + { + "index": 32, + "name": "Резерв", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 76, 77 ] + }, + { + "index": 33, + "name": "Вакуум по МЕТРАН-1200", + "s_name": "МЕТРАН-1200", + "metric": "мм.рт.ст", + "mul": 0.1, + "show_default": true, + "bytes": [ 78, 79 ] + }, + { + "index": 34, + "name": "Вакуум по МЕТРАН-18,75", + "s_name": "МЕТРАН-18,25", + "metric": "мм.рт.ст", + "mul": 0.001, + "show_default": true, + "bytes": [ 80, 81 ] + }, + { + "index": 35, + "name": "Давление газа в баллоне", + "s_name": "P г.балл.", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [ 82, 83 ] + }, + { + "index": 36, + "name": "Давление воды поддона", + "s_name": "P в.подд.", + "metric": "кгс/см^2", + "mul": 1, + "bytes": [ 84, 85 ] + }, + { + "index": 37, + "name": "Задание тока дуги (ЦАП)", + "s_name": "Зад.I, ЦАП", + "metric": "кА", + "mul": 0.1, + "bytes": [ 86, 87 ] + }, + { + "index": 38, + "name": "Задкние скорости рабочего двигателя", + "s_name": "Зад.ск.раб.дв", + "metric": "В", + "mul": 0.1, + "bytes": [ 88, 89 ] + }, + { + "index": 39, + "name": "Ток двигателя насоса ARPW", + "s_name": "I дв. ARPW", + "metric": "А", + "mul": 0.01, + "bytes": [ 90, 91 ] + }, + { + "index": 40, + "name": "Энергия плавильного пролёта", + "s_name": "Эн.пролёта, МВт", + "metric": "МВт", + "mul": 0.1, + "bytes": [ 92, 93 ] + }, + { + "index": 41, + "name": "Среднее напряжение плавления", + "s_name": "U средн, В", + "metric": "В", + "mul": 0.1, + "bytes": [ 94, 95 ] + }, + { + "index": 42, + "name": "ГМП: ток катушки 1", + "s_name": "I кат1 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 96, 97 ] + }, + { + "index": 43, + "name": "ГМП: ток катушки 2", + "s_name": "I кат2 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 98, 99 ] + }, + { + "index": 44, + "name": "ГМП: ток катушки 3", + "s_name": "I кат3 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 100, 101 ] + }, + { + "index": 45, + "name": "ГМП: частота", + "s_name": "Част. ГМП", + "metric": "Гц", + "mul": 1, + "bytes": [ 102, 103 ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/Config/Analog/global.json b/ApiServer/Config/Analog/global.json new file mode 100644 index 0000000..f65ef99 --- /dev/null +++ b/ApiServer/Config/Analog/global.json @@ -0,0 +1,110 @@ +{ + "00": { + "struct": [ + { + "index": 0, + "name": "Общий: t воды водооборота", + "s_name": "t в", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 1, + "name": "Общий: Давление воды водооборота", + "s_name": "P в", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [] + }, + { + "index": 2, + "name": "Общий: Давление масла в бутыли", + "s_name": "P масла бут", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 3, + "name": "Общий: t воздуха в машинном зале", + "s_name": "t машзал", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 4, + "name": "Общий: t воздуха на улице", + "s_name": "t улица", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 5, + "name": "Общий: Атмосферное давление", + "s_name": "p атм", + "metric": "мм.рт.ст", + "mul": 0.1, + "bytes": [] + }, + { + "index": 6, + "name": "Общий: Давление масла в магистрали", + "s_name": "P масла маг", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 7, + "name": "Общий: Давление воды водооборота-К90", + "s_name": "P в-90", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 8, + "name": "Скорость штока за 1 мин", + "s_name": "V шт", + "metric": "мм/мин", + "mul": 0.01, + "bytes": [] + }, + { + "index": 9, + "name": "Вакуум по МЕТРАН 1,2", + "s_name": "МЕТРАН1,2", + "metric": "мм.рт.ст", + "mul": 0.001, + "bytes": [] + }, + { + "index": 10, + "name": "ВС: Ток дуги", + "s_name": "ВС:I д", + "metric": "кА", + "mul": 0.1, + "bytes": [] + }, + { + "index": 12, + "name": "ВС: Напряжение дуги", + "s_name": "ВС:U д", + "metric": "В", + "mul": 0.1, + "bytes": [] + }, + { + "index": 13, + "name": "ВС: Ток задания", + "s_name": "ВС:I рз", + "metric": "кА", + "mul": 0.1, + "bytes": [] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/Config/Colors.json b/ApiServer/Config/Colors.json new file mode 100644 index 0000000..4a09cea --- /dev/null +++ b/ApiServer/Config/Colors.json @@ -0,0 +1,3 @@ +{ + "red" : "#ff0000" +} \ No newline at end of file diff --git a/ApiServer/Config/Discret/all.json b/ApiServer/Config/Discret/all.json new file mode 100644 index 0000000..506b7a3 --- /dev/null +++ b/ApiServer/Config/Discret/all.json @@ -0,0 +1,87 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { + "parent": [ "default" ], + "struct": [ + { + "index": 2, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + } + ] + }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { + "parent": [ "default" ], + "struct": [ + { + "index": 1, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + } + ] + + }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/Config/Discret/default.json b/ApiServer/Config/Discret/default.json new file mode 100644 index 0000000..4969fef --- /dev/null +++ b/ApiServer/Config/Discret/default.json @@ -0,0 +1,823 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Дискрет №0", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 0 + } + ] + }, + { + "index": 1, + "name": "P1 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + }, + { + "index": 2, + "name": "P2 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + }, + { + "index": 3, + "name": "Вода камеры", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 3 + } + ] + }, + { + "index": 4, + "name": "Вода штока", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 4 + } + ] + }, + { + "index": 5, + "name": "Дверь - А", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 5 + } + ] + }, + { + "index": 6, + "name": "Дверь - Б", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 6 + } + ] + }, + { + "index": 7, + "name": "Дверь - В", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 7 + } + ] + }, + { + "index": 8, + "name": "Дверь - Г", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 0 + } + ] + }, + { + "index": 9, + "name": "Дверь - Д", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 1 + } + ] + }, + { + "index": 10, + "name": "Люк", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 2 + } + ] + }, + { + "index": 11, + "name": "Пенал", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 3 + } + ] + }, + { + "index": 12, + "name": "Упоры", + "state_struct": "out_in_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 4 + } + ] + }, + { + "index": 13, + "name": "Прижимы", + "state_struct": "spinn_clamp_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 5 + } + ] + }, + { + "index": 14, + "name": "Вакуумный выключатель", + "state_struct": "none_on_off_err_3_4", + "bits": [ + { + "byte_index": 47, + "bit_index": 6 + }, + { + "byte_index": 47, + "bit_index": 7 + } + ] + }, + { + "index": 15, + "skip": true + }, + { + "index": 16, + "name": "\"Автоматика\"", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 7 + } + ] + }, + { + "index": 31, + "skip": true + }, + { + "index": 17, + "name": "БПС", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 1 + }, + { + "byte_index": 50, + "bit_index": 0 + } + ] + }, + { + "index": 32, + "skip": true + }, + { + "index": 18, + "name": "Соленоид", + "state_struct": "none_err_const_puls_1_2", + "bits": [ + { + "byte_index": 48, + "bit_index": 2 + }, + { + "byte_index": 48, + "bit_index": 3 + } + ] + }, + { + "index": 19, + "skip": true + }, + { + "index": 20, + "name": "ARPW", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 4 + }, + { + "byte_index": 48, + "bit_index": 7 + } + ] + }, + { + "index": 23, + "skip": true + }, + { + "index": 21, + "name": "ДВН", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 5 + }, + { + "byte_index": 49, + "bit_index": 3 + } + ] + }, + { + "index": 27, + "skip": true + }, + { + "index": 22, + "name": "SZO", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 48, + "bit_index": 6 + } + ] + }, + { + "index": 24, + "name": "ДУ-260", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 1 + } + ] + }, + { + "index": 25, + "skip": true + }, + { + "index": 26, + "name": "ДУ-100", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 2 + }, + { + "byte_index": 50, + "bit_index": 2 + } + ] + }, + { + "index": 34, + "skip": true + }, + { + "index": 28, + "name": "ДУ-32", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 4 + }, + { + "byte_index": 50, + "bit_index": 3 + } + ] + }, + { + "index": 35, + "skip": true + }, + { + "index": 29, + "name": "Шток вверху", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 5 + } + ] + }, + { + "index": 30, + "name": "Шток внизу", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 6 + } + ] + }, + { + "index": 33, + "name": "Плохой вакуум", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 1 + } + ] + }, + { + "index": 36, + "name": "Напряжение аварийной сигнализации", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 50, + "bit_index": 4 + } + ] + }, + { + "index": 37, + "name": "Взрывной клапан", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 5 + } + ] + }, + { + "index": 38, + "name": "Ключ УП в положении \"Автоматика\"", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 6 + } + ] + }, + { + "index": 39, + "name": "off_on_err", + "state_struct": "Реле \"Авария источника\"", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 40, + "name": "Сброс звуковой сигнализации", + "state_struct": "spinn_press", + "bits": [ + { + "byte_index": 51, + "bit_index": 0 + } + ] + }, + { + "index": 41, + "name": "Вакуум по ЭКМВ", + "state_struct": "have_no_err", + "bits": [ + { + "byte_index": 51, + "bit_index": 1 + } + ] + }, + { + "index": 42, + "name": "Реле \"Имитация тока дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 2 + } + ] + }, + { + "index": 43, + "name": "Реле \"АУ током дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 3 + } + ] + }, + { + "index": 44, + "name": "Реле \"Имитация напряжения дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 4 + } + ] + }, + { + "index": 45, + "name": "Реле \"Имитация вакуума печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 5 + } + ] + }, + { + "index": 46, + "name": "Реле \"Имитация T воды кристаллизатора\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 6 + } + ] + }, + { + "index": 47, + "name": "Реле \"Имитация T воды вакуумкамеры\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 7 + } + ] + }, + { + "index": 48, + "name": "Реле \"Имитация T воды штока\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 0 + } + ] + }, + { + "index": 49, + "name": "Реле 1 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 1 + } + ] + }, + { + "index": 50, + "name": "Реле 2 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 2 + } + ] + }, + { + "index": 51, + "name": "Реле 3 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 3 + } + ] + }, + { + "index": 52, + "name": "Реле 4 \"Контроль метрологии\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 4 + } + ] + }, + { + "index": 53, + "name": "Реле 5 \"Измерение изоляции (соленоид)\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 5 + } + ] + }, + { + "index": 54, + "name": "Реле \"АУ штоком\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 6 + } + ] + }, + { + "index": 55, + "name": "Реле \"Включение Uкалибровки\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 7 + } + ] + }, + { + "index": 56, + "name": "Реле \"Движение штока вверх\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 0 + } + ] + }, + { + "index": 57, + "name": "УП в положении КЗ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 1 + } + ] + }, + { + "index": 58, + "name": "Нет питания, включено \"резервное\" UPS", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 2 + } + ] + }, + { + "index": 59, + "name": "Вода подставки", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 3 + } + ] + }, + { + "index": 60, + "name": "Реле \"Разрешение на вакуумирование печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 4 + } + ] + }, + { + "index": 61, + "name": "Низкий заряд аккумулятора UPS", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 5 + } + ] + }, + { + "index": 62, + "name": "КВ рамы", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 6 + } + ] + }, + { + "index": 63, + "name": "Источник: +24В", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 64, + "name": "Реле \"Движение штока вниз\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 0 + } + ] + }, + { + "index": 65, + "name": "Проверка источника", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 1 + } + ] + }, + { + "index": 66, + "name": "Станция", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + }, + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 67, + "skip": true + }, + { + "index": 68, + "name": "Постоянное U=220В", + "state_struct": "no_have", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": "Источник готов", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 70, + "name": "Авария привода", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 6 + } + ] + }, + { + "index": 71, + "name": "Реле \"Напуск газа в печь\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 7 + } + ] + }, + { + "index": 74, + "name": "Реле \"АУ током дуги ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 76, + "name": "Готовность привода", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 4 + } + ] + }, + { + "index": 78, + "name": "Реле \"Авария источника ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 6 + } + ] + }, + { + "index": 79, + "name": "Клапан подачи аргона", + "state_struct": "close_open_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 7 + } + ] + }, + { + "index": 95, + "name": "Разрешение на вкл. вакуумного выключателя", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 57, + "bit_index": 7 + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/Config/Discret/power_new.json b/ApiServer/Config/Discret/power_new.json new file mode 100644 index 0000000..5fd7d88 --- /dev/null +++ b/ApiServer/Config/Discret/power_new.json @@ -0,0 +1,127 @@ +{ + "power_new": { + "struct": [ + { + "index": 39, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 63, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 66, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + } + ] + }, + { + "index": 67, + "name": ". ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 68, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": " ", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 72, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 0 + } + ] + }, + { + "index": 73, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 1 + } + ] + }, + { + "index": 74, + "name": " ", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 75, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 3 + } + ] + }, + { + "index": 77, + "name": " ", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 5 + } + ] + } + ] + } +} diff --git a/ApiServer/Config/Metrics.json b/ApiServer/Config/Metrics.json new file mode 100644 index 0000000..e0b5f48 --- /dev/null +++ b/ApiServer/Config/Metrics.json @@ -0,0 +1,13 @@ +{ + "кА": false, + "В": false, + "А": false, + "гр.С": false, + "мм": false, + "мкм.рт.ст": true, + "м^3/ч": false, + "кгс/см^2": false, + "мм.рт.ст": true, + "МВт": false, + "Гц": true +} \ No newline at end of file diff --git a/ApiServer/Config/Protect/all.json b/ApiServer/Config/Protect/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/Config/Protect/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/Config/Protect/default.json b/ApiServer/Config/Protect/default.json new file mode 100644 index 0000000..8bea6f7 --- /dev/null +++ b/ApiServer/Config/Protect/default.json @@ -0,0 +1,356 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Alarm ! Zero signal !", + "state_struct": "protect_1" + }, + { + "index":1, + "name": "Шток внизу !", + "state_struct": "protect_1" + }, + { + "index":2, + "name": "Шток вверху !", + "state_struct": "protect_1" + }, + { + "index": 3, + "name": "Uдуги > Uмакс !", + "state_struct": "protect_1" + }, + { + "index": 4, + "name": "Uдуги < Uмин !", + "state_struct": "protect_1" + }, + { + "index": 5, + "name": "Qводы кристаллизатора !", + "state_struct": "protect_1" + }, + { + "index": 6, + "name": "P2 воды кристаллизатора ЭКМ отметка -5м !", + "state_struct": "protect_1" + }, + { + "index": 7, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 8, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 9, + "name": "Вода штока !", + "state_struct": "protect_1" + }, + { + "index":10, + "name": "tводы штока !", + "state_struct": "protect_1" + }, + { + "index":11, + "name": "Вода вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":12, + "name": "tводы вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":13, + "name": "Ухудшение вакуума !", + "state_struct": "protect_1" + }, + { + "index": 14, + "name": "Нет готовности к токовой операции!", + "state_struct": "protect_1" + }, + { + "index": 15, + "name": "Дверь А открыта !", + "state_struct": "protect_1" + }, + { + "index": 16, + "name": "Дверь Б открыта !", + "state_struct": "protect_1" + }, + { + "index": 17, + "name": "Дверь В открыта !", + "state_struct": "protect_1" + }, + { + "index": 18, + "name": "Дверь Г открыта !", + "state_struct": "protect_1" + }, + { + "index": 19, + "name": "Дверь Д открыта !", + "state_struct": "protect_1" + }, + { + "index": 20, + "name": "Прижимы !", + "state_struct": "protect_1" + }, + { + "index": 21, + "name": "Упоры !", + "state_struct": "protect_1" + }, + { + "index": 22, + "name": "Люк открыт !", + "state_struct": "protect_1" + }, + { + "index": 23, + "name": "Пенал открыт !", + "state_struct": "protect_1" + }, + { + "index": 24, + "name": "Вода подставки !", + "state_struct": "protect_1" + }, + { + "index": 25, + "name": "Нет U аварийной сигнализации !", + "state_struct": "protect_1" + }, + { + "index": 26, + "name": "Плохой вакуум !", + "state_struct": "protect_1" + }, + { + "index": 27, + "name": "tводы подставки !", + "state_struct": "protect_1" + }, + { + "index": 28, + "name": "Давление газа в печи выше атмосферного !", + "state_struct": "protect_1" + }, + { + "index": 29, + "name": "Вода фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 30, + "name": "Отключение ВВ!", + "state_struct": "protect_1" + }, + { + "index": 31, + "name": "tводы фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 32, + "name": "P воды поддона !", + "state_struct": "protect_1" + }, + { + "index": 33, + "name": "Отсутствует связь с сервером 1 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 34, + "name": "Отсутствует связь с сервером 2 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 35, + "name": "Отсутствует связь с контроллером ГМП !", + "state_struct": "protect_1" + }, + { + "index": 36, + "name": "Неисправность в работе ARPW !", + "state_struct": "protect_1" + }, + { + "index": 37, + "name": "Неисправность в работе ДВН !", + "state_struct": "protect_1" + }, + { + "index": 38, + "name": "Неисправность в работе ВВ !", + "state_struct": "protect_1" + }, + { + "index": 39, + "name": "Неисправность в работе ДУ-260 !", + "state_struct": "protect_1" + }, + { + "index": 40, + "name": "Неисправность в работе ДУ-100 !", + "state_struct": "protect_1" + }, + { + "index": 41, + "name": "Неисправность в работе ДУ-32 !", + "state_struct": "protect_1" + }, + { + "index": 43, + "name": "Неисправность в работе БПС !", + "state_struct": "protect_1" + }, + { + "index": 44, + "name": "Неисправность в режиме работы соленоида !", + "state_struct": "protect_1" + }, + { + "index": 45, + "name": "Нет питания сети !", + "state_struct": "protect_1" + }, + { + "index": 46, + "name": "КВ рамы", + "state_struct": "protect_1" + }, + { + "index": 48, + "name": "Нет сигнала датчика (МЕТРАН отм.+1.5м) !", + "state_struct": "protect_1" + }, + { + "index": 49, + "name": "БПС ГМП отключен!", + "state_struct": "protect_1" + }, + { + "index": 50, + "name": "Неисправность источника питания ВДП !", + "state_struct": "protect_1" + }, + { + "index": 51, + "name": "Нет принимаемых данных !", + "state_struct": "protect_1" + }, + { + "index": 52, + "name": "Разрыв дуги !", + "state_struct": "protect_1" + }, + { + "index": 53, + "name": "Нет готовности привода!", + "state_struct": "protect_1" + }, + { + "index": 54, + "name": "Alarm ! Signal A1_22 is set.", + "state_struct": "protect_1" + }, + { + "index": 55, + "name": "Короткое замыкание !", + "state_struct": "protect_1" + }, + { + "index": 56, + "name": "Переключатель УП не в положении АВТ !", + "state_struct": "protect_1" + }, + { + "index": 57, + "name": "Проверить перевод разьединителей печей!", + "state_struct": "protect_1" + }, + { + "index": 58, + "name": "Снижение протока воды штока!", + "state_struct": "protect_1" + }, + { + "index": 59, + "name": "Снижение протока воды камеры!", + "state_struct": "protect_1" + }, + { + "index": 60, + "name": "Снижение протока воды фланца!", + "state_struct": "protect_1" + }, + { + "index": 61, + "name": "Запрет зажигания дуги по времени вакуумирования!", + "state_struct": "protect_1" + }, + { + "index": 62, + "name": "Отсутствует ток соленоида !", + "state_struct": "protect_1" + }, + { + "index": 63, + "name": "Отсутствует перемещение штока !", + "state_struct": "protect_1" + }, + { + "index": 64, + "name": "Отсутствует перемещение штока > 15 минут!", + "state_struct": "protect_1" + }, + { + "index": 65, + "name": "Запрет на включение вакуумных насосов !", + "state_struct": "protect_1" + }, + { + "index": 67, + "name": "ВДП развакуумирована !", + "state_struct": "protect_1" + }, + { + "index": 70, + "name": "Смещение начала архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 71, + "name": "Смещение конца архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 74, + "name": "", + "state_struct": "protect_1" + }, + { + "index": 75, + "name": "Alarm ! Signal A1_43 is set.", + "state_struct": "protect_1" + }, + { + "index": 76, + "name": "Alarm ! Signal A1_44 is set.", + "state_struct": "protect_1" + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/Config/StateStruct.json b/ApiServer/Config/StateStruct.json new file mode 100644 index 0000000..557fa01 --- /dev/null +++ b/ApiServer/Config/StateStruct.json @@ -0,0 +1,265 @@ +{ + "protect_1": [ + { + "index": 0, + "name": "Отсутствует", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Сработало", + "color": "#ffff00" + }, + { + "index": 2, + "name": "Сброс тока", + "color": "#ff0000" + } + ], + "no_yes_err": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#ff0000" + } + ], + "no_yes_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "no_yes": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "have_no_err": [ + { + "index": 0, + "name": "Есть", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Нет", + "color": "#ff0000" + } + ], + "no_have_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "no_have": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "off_on_err": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#ff0000" + } + ], + "off_on": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + } + ], + "open_close_ok": [ + { + "index": 0, + "name": "Откр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Закр", + "color": "#00ff00" + } + ], + "close_open_ok": [ + { + "index": 0, + "name": "Закр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + } + ], + + "out_in_ok": [ + { + "index": 0, + "name": "Не введ", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Введ", + "color": "#00ff00" + } + ], + "spinn_clamp_ok": [ + { + "index": 0, + "name": "Отж", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Приж", + "color": "#00ff00" + } + ], + "spinn_press": [ + { + "index": 0, + "name": "Отж", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Наж", + "color": "#00ff00" + } + ], + "none_on_off_err_3_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#ff0000" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_on_off_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_err_const_puls_1_2": [ + { + "index": 0, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 2, + "name": "Пост", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Пульс", + "color": "#00ff00" + } + ], + "none_open_close_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Закр", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ] + +} \ No newline at end of file diff --git a/ApiServer/Config/TechCycle.json b/ApiServer/Config/TechCycle.json new file mode 100644 index 0000000..715756d --- /dev/null +++ b/ApiServer/Config/TechCycle.json @@ -0,0 +1,94 @@ +{ + "tech_cycle_conf": [ + { + "index": -1, + "name": "Конец технологического цикла (ручной)", + "color": "#00ffff" + }, + { + "index": 0, + "name": "Конец технологического цикла", + "color": "#00ffff" + }, + { + "index": 1, + "name": "Выгрузка-загрузка", + "color": "#00ffff" + }, + { + "index": 2, + "name": "Вакуумирование на приварку", + "color": "#0000ff" + }, + { + "index": 5, + "name": "Приварка", + "color": "#ff0000" + }, + { + "index": 6, + "name": "Охлаждение приварки", + "color": "#00ff00" + }, + { + "index": 7, + "name": "Осмотр приварки", + "color": "#00ffff" + }, + { + "index": 8, + "name": "Вакуумирование на плавку", + "color": "#0000ff" + }, + { + "index": 9, + "name": "Разведение ванны", + "color": "#8500b6" + }, + { + "index": 10, + "name": "Плавка (основной режим)", + "color": "#ff0000" + }, + { + "index": 11, + "name": "ВУР", + "color": "#ff00ff" + }, + { + "index": 12, + "name": "Охлаждение слитка", + "color": "#00ff00" + }, + { + "index": 13, + "name": "Выгрузка комплекта", + "color": "#00ffff" + }, + { + "index": 14, + "name": "Вакуумирование на оплавление", + "color": "#0000ff" + }, + { + "index": 15, + "name": "Оплавление", + "color": "#ff0000" + }, + { + "index": 16, + "name": "Охлаждение оплавыша", + "color": "#00ff00" + }, + { + "index": 17, + "name": "Слив металла", + "color": "#8500b6" + }, + { + "index": 25, + "name": "Проверка защит", + "color": "#00ffff" + } + ] +} \ No newline at end of file diff --git a/ApiServer/Controllers/DateController.cs b/ApiServer/Controllers/DateController.cs new file mode 100644 index 0000000..0456804 --- /dev/null +++ b/ApiServer/Controllers/DateController.cs @@ -0,0 +1,324 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json.Linq; +using Newtonsoft; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; +using NLog; +using DataClient.Struct; +using System.IO; +using ApiServer.ApiStruct; + +namespace ApiServer.Controllers +{ + [ApiController, Route("[controller]")] + public class DateController : ControllerBase + { + private Logger log = LogManager.GetCurrentClassLogger(); + + [HttpPost, Route("getanalog")] + public DateGetAnalogClient GetAnalog([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask analog: vdp-" + + getResult.Vdp.ToString() + " index-" + + getResult.Index.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_analogs = new Dictionary>(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + var sub_res = new List(); + while (flagDate <= getResult.End) + { + var analogs = WorkWithFiles.GetAnalogs(flagDate, getResult.Vdp); + foreach (var analog_arr in analogs) + { + if (analog_arr.Index != getResult.Index) + continue; + Structures.Analog first_analog = null; + for (var i = 0; i < analog_arr.Analogs.Length; i++) + { + if (analog_arr.Analogs[i].start < getResult.Start) + { + first_analog = analog_arr.Analogs[i]; + first_analog.start = getResult.Start; + continue; + } + if (analog_arr.Analogs[i].start > getResult.End) + continue; + if (sub_res.Count == 0 && first_analog != null) + sub_res.Add(first_analog); + sub_res.Add(analog_arr.Analogs[i]); + } + } + flagDate = flagDate.AddDays(1); + } + + return new DateGetAnalogClient() + { + Analog = sub_res.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + throw; + //return new DateGetAnalogClient(); + } + } + + [HttpPost, Route("getanalogs")] + public DateGetAnalogsClient GetAnalogs([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask analog: vdp-" + + getResult.Vdp.ToString() + " index-" + + getResult.Index.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_analogs = new Dictionary>(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + var sub_res = new Dictionary>(); + while (flagDate <= getResult.End) + { + var analogs = WorkWithFiles.GetAnalogs(flagDate, getResult.Vdp); + foreach (var analog_arr in analogs) + { + if (!getResult.Index.Contains(analog_arr.Index)) + continue; + if (!sub_res.ContainsKey(analog_arr.Index)) + sub_res.Add(analog_arr.Index, new List()); + Structures.Analog first_analog = null; + for (var i = 0; i < analog_arr.Analogs.Length; i++) + { + if (analog_arr.Analogs[i].start < getResult.Start) + { + first_analog = analog_arr.Analogs[i]; + first_analog.start = getResult.Start; + continue; + } + if (analog_arr.Analogs[i].start > getResult.End) + continue; + if (sub_res[analog_arr.Index].Count == 0 && first_analog != null) + sub_res[analog_arr.Index].Add(first_analog); + sub_res[analog_arr.Index].Add(analog_arr.Analogs[i]); + } + } + flagDate = flagDate.AddDays(1); + } + var result = new List(); + foreach (var d in sub_res) + result.Add(new Structures.AnalogArr() { + Index = d.Key, + Analogs = d.Value.ToArray() + }); + return new DateGetAnalogsClient() + { + Analogs = result.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new DateGetAnalogsClient(); + } + } + + [HttpPost, Route("gettechcycle")] + public DateGetTechCycleClient GetTechCycle([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask tech cycle: " + + getResult.Vdp.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + var list_tech_cycles = new List(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + while (flagDate <= getResult.End) + { + var lines = WorkWithFiles.GetFile( + flagDate.Year.ToString("D4") + + flagDate.Month.ToString("D2") + + flagDate.Day.ToString("D2") + + "." + + getResult.Vdp.ToString("D2") + + "3" + ); + Structures.TechCycle first_tech_cycle = null; + for (var i = 0; i < lines.Length; i++) + { + var tc = new Structures.TechCycle(flagDate, lines[i]); + if (tc.start < getResult.Start) + { + first_tech_cycle = tc; + continue; + } + if (tc.start > getResult.End) + continue; + if (list_tech_cycles.Count == 0 && first_tech_cycle != null) + { + first_tech_cycle.start = getResult.Start; + list_tech_cycles.Add(first_tech_cycle); + } + list_tech_cycles.Add(tc); + } + flagDate = flagDate.AddDays(1); + } + + + return new DateGetTechCycleClient() + { + TechCycle = list_tech_cycles.ToArray(), + }; + } + catch (Exception e) + { + log.Warn(e); + return new DateGetTechCycleClient(); + } + } + + [HttpPost, Route("getprotect")] + public DateGetProtectClient GetProtect([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask protects: " + + getResult.Vdp.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_protects = new List(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + while (flagDate <= getResult.End) + { + var protects = WorkWithFiles.GetProtects(flagDate, getResult.Vdp); + for (var i = 0; i < protects.Length; i++) + { + if (protects[i].start < getResult.Start) + continue; + if (protects[i].start > getResult.End) + continue; + list_protects.Add(protects[i]); + } + flagDate = flagDate.AddDays(1); + } + + + return new DateGetProtectClient() + { + Protect = list_protects.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new DateGetProtectClient(); + } + } + + [HttpPost, Route("getdiscret")] + public DateGetDiscretClient GetDiscret([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask discrets: " + + getResult.Vdp.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_discrets = new List(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + while (flagDate <= getResult.End) + { + var discrets = WorkWithFiles.GetDiscrets(flagDate, getResult.Vdp); + var first_discrets = new Dictionary(); + for (var i = 0; i < discrets.Length; i++) + { + if (discrets[i].start < getResult.Start) + { + if (first_discrets.ContainsKey(discrets[i].Index)) + first_discrets[discrets[i].Index] = discrets[i]; + else + first_discrets.Add(discrets[i].Index, discrets[i]); + first_discrets[discrets[i].Index].start = getResult.Start; + continue; + } + if (discrets[i].start > getResult.End) + continue; + var last_id = list_discrets.FindLastIndex(x => x.Index == discrets[i].Index); + if (first_discrets.ContainsKey(discrets[i].Index) && + last_id == -1 && + discrets[i].start != getResult.Start) + { + list_discrets.Add(first_discrets[discrets[i].Index]); + first_discrets.Remove(discrets[i].Index); + } + if (last_id != -1 && + list_discrets[last_id].State == discrets[i].State) + continue; + list_discrets.Add(discrets[i]); + } + flagDate = flagDate.AddDays(1); + } + + return new DateGetDiscretClient() + { + Discret = list_discrets.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new DateGetDiscretClient(); + } + } + + + } + + +} diff --git a/ApiServer/Controllers/DiscretController.cs b/ApiServer/Controllers/DiscretController.cs new file mode 100644 index 0000000..3c6495c --- /dev/null +++ b/ApiServer/Controllers/DiscretController.cs @@ -0,0 +1,138 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json.Linq; +using Newtonsoft; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; +using NLog; +using DataClient.Struct; +using System.IO; +using ApiServer.ApiStruct; + +namespace ApiServer.Controllers +{ + [ApiController, Route("[controller]")] + public class DiscretController : ControllerBase + { + private Logger log = LogManager.GetCurrentClassLogger(); + + [HttpPost, Route("getdiscrets")] + public DiscretGetDscretsClient GetDiscrets([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask discrets: " + + getResult.Vdp.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " "+ + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_discrets = new List(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0,0,0 + ); + while (flagDate <= getResult.End) + { + var discrets = WorkWithFiles.GetDiscrets(flagDate, getResult.Vdp); + var first_discrets = new Dictionary(); + for (var i = 0; i < discrets.Length; i++) + { + if (discrets[i].start < getResult.Start) + { + if (first_discrets.ContainsKey(discrets[i].Index)) + first_discrets[discrets[i].Index] = discrets[i]; + else + first_discrets.Add(discrets[i].Index, discrets[i]); + first_discrets[discrets[i].Index].start = getResult.Start; + continue; + } + if (discrets[i].start > getResult.End) + continue; + var last_id = list_discrets.FindLastIndex(x => x.Index == discrets[i].Index); + if (first_discrets.ContainsKey(discrets[i].Index) && + last_id == -1 && + discrets[i].start != getResult.Start) + { + list_discrets.Add(first_discrets[discrets[i].Index]); + first_discrets.Remove(discrets[i].Index); + } + if (last_id != -1 && + list_discrets[last_id].State == discrets[i].State) + continue; + list_discrets.Add(discrets[i]); + } + flagDate = flagDate.AddDays(1); + } + + return new DiscretGetDscretsClient() + { + StateParams = Configuration.GetStateStructArray(), + DiscretParams = Configuration.GetDiscretParams(getResult.Vdp.ToString("D2")), + Discrets = list_discrets.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new DiscretGetDscretsClient(); + } + } + + [HttpPost, Route("getdiscretsmatrix")] + public DiscretGetDscretsMatrixClient GetDiscretsMatrix([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask discrets: " + + getResult.Vdp.ToString() + " " + + getResult.Start.ToString("yyyy-MM-dd HH:mm:ss") + " " + + getResult.End.ToString("yyyy-MM-dd HH:mm:ss")); + + var list_discrets = new List(); + var flagDate = new DateTime( + getResult.Start.Year, + getResult.Start.Month, + getResult.Start.Day, + 0, 0, 0 + ); + while (flagDate <= getResult.End) + { + var discrets = WorkWithFiles.GetDiscretsMatrix(flagDate, getResult.Vdp); + for (var i = 0; i < discrets.Length; i++) + { + if (discrets[i].start < getResult.Start) + continue; + if (discrets[i].start > getResult.End) + continue; + list_discrets.Add(discrets[i]); + } + flagDate = flagDate.AddDays(1); + } + + log.Info("Send discret"); + return new DiscretGetDscretsMatrixClient() + { + StateParams = Configuration.GetStateStructArray(), + DiscretParams = Configuration.GetDiscretParams(getResult.Vdp.ToString("D2")), + Discrets = list_discrets.ToArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new DiscretGetDscretsMatrixClient(); + } + } + + } + +} diff --git a/ApiServer/Controllers/ParamsController.cs b/ApiServer/Controllers/ParamsController.cs new file mode 100644 index 0000000..4251886 --- /dev/null +++ b/ApiServer/Controllers/ParamsController.cs @@ -0,0 +1,158 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json.Linq; +using Newtonsoft; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; +using NLog; +using DataClient.Struct; +using System.IO; +using ApiServer.ApiStruct; + +namespace ApiServer.Controllers +{ + [ApiController, Route("[controller]")] + public class ParamsController : ControllerBase + { + private Logger log = LogManager.GetCurrentClassLogger(); + + [HttpPost, Route("getanalogs")] + public ParamsGetAnalogClient GetAnalogs([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask analog params for \"" + getResult.Name + "\""); + return new ParamsGetAnalogClient() + { + Analog_params = Configuration.GetAnalogParams(getResult.Name) + }; + } + catch (Exception e) + { + log.Error(e); + return new ParamsGetAnalogClient(); + } + } + + [HttpPost, Route("getmetrics")] + public ParamsGetMetricClient GetMetrics([FromBody] object value) + { + try + { + log.Info("Ask metrics"); + return new ParamsGetMetricClient() + { + Metrics = Configuration.GetMetricsArray() + }; + } + catch (Exception e) + { + log.Error(e); + return new ParamsGetMetricClient(); + } + } + + [HttpPost, Route("gettechcyclename")] + public ParamsGetTechCycleNameClient GetTechCycleName([FromBody] object value) + { + try + { + log.Info("Ask tech cycle name"); + return new ParamsGetTechCycleNameClient() + { + Name = Configuration.GetTechCycleNames() + }; + } + catch (Exception e) + { + log.Warn(e); + return new ParamsGetTechCycleNameClient(); + } + } + + [HttpPost, Route("gettechcyclecolor")] + public ParamsGetTechCycleColorClient GetTechCycleColor([FromBody] object value) + { + try + { + log.Info("Ask tech cycle color"); + return new ParamsGetTechCycleColorClient() + { + Color = Configuration.GetTechCycleColor() + }; + } + catch (Exception e) + { + log.Warn(e); + return new ParamsGetTechCycleColorClient(); + } + } + + [HttpPost, Route("getstatestruct")] + public ParamsGetStateStructClient GetStateStruct([FromBody] object value) + { + try + { + log.Info("Ask state struct"); + return new ParamsGetStateStructClient() + { + StateStruct = Configuration.GetStateStructArray() + }; + } + catch (Exception e) + { + log.Warn(e); + return new ParamsGetStateStructClient(); + } + } + + [HttpPost, Route("getprotectstate")] + public ParamsGetProtectStateClient GetProtectState([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + + log.Info("Ask protect state for vdp: " + getResult.Name); + return new ParamsGetProtectStateClient() + { + ProtectState = Configuration.GetProtectState(getResult.Name) + }; + } + catch (Exception e) + { + log.Warn(e); + return new ParamsGetProtectStateClient(); + } + } + + [HttpPost, Route("getdiscret")] + public ParamsGetDiscretClient GetDiscrets([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString()); + log.Info("Ask discret params for \"" + getResult.Name + "\""); + return new ParamsGetDiscretClient() + { + Discret_params = Configuration.GetDiscretParams(getResult.Name) + }; + } + catch (Exception e) + { + log.Error(e); + return new ParamsGetDiscretClient(); + } + } + + + + } +} diff --git a/ApiServer/Controllers/PasportController.cs b/ApiServer/Controllers/PasportController.cs index dae6570..99ef4f3 100644 --- a/ApiServer/Controllers/PasportController.cs +++ b/ApiServer/Controllers/PasportController.cs @@ -109,17 +109,21 @@ namespace ApiServer.Controllers try { var pasportNameList = new List(); - var getResult = JsonConvert.DeserializeObject(value.ToString()); + var pasportTimeList = new List(); + var getResult = JsonConvert.DeserializeObject( + value.ToString(), + new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd" }); + log.Info("Ask pasport list: " + getResult.Date.ToString("yyyy-MM-dd")); var pasportDir = Path.Combine( Directory.GetCurrentDirectory(), "data", "pasport", getResult.Date.Year.ToString("D4"), - getResult.Date.ToString("D2"), + getResult.Date.Month.ToString("D2"), getResult.Date.Day.ToString("D2") ); if (!Directory.Exists(pasportDir)) - return new PasportGetListClient(); + throw new Exception("Directory not exist: " + pasportDir); var allPasportFiles = Directory.GetFiles(pasportDir); foreach (var fullPasportName in allPasportFiles) { @@ -132,10 +136,15 @@ namespace ApiServer.Controllers pasport += "-"; pasport += pasportParts[i]; } + pasportTimeList.Add(pasportParts[0]); pasportNameList.Add(pasport); } log.Info("Send pasport list: " + pasportNameList); - return new PasportGetListClient() { Name = pasportNameList.ToArray() }; + return new PasportGetListClient() + { + Name = pasportNameList.ToArray(), + Time = pasportTimeList.ToArray() + }; } catch (Exception e) { @@ -144,6 +153,75 @@ namespace ApiServer.Controllers } } + [HttpPost, Route("getpasport")] + public PasportGetPasportClient GetPasport([FromBody] object value) + { + try + { + var getResult = JsonConvert.DeserializeObject( + value.ToString(), + new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd" }); + log.Info("Ask pasport: " + getResult.Date.ToString("yyyy-MM-dd") + " " + getResult.Name); + var pasportFile = Path.Combine( + Directory.GetCurrentDirectory(), + "data", + "pasport", + getResult.Date.Year.ToString("D4"), + getResult.Date.Month.ToString("D2"), + getResult.Date.Day.ToString("D2"), + getResult.Name + ); + if (!System.IO.File.Exists(pasportFile)) + throw new Exception("File not exist: " + pasportFile); + var pasport = new Pasport(System.IO.File.ReadAllBytes(pasportFile)); + return new PasportGetPasportClient() + { + HasData = pasport.HasData, + NumVDP = pasport.numVDP, + DStart = pasport.dStart.HasValue ? pasport.dStart.Value.ToString("yyyy.MM.dd HH:mm:ss") : "", + DEnd = pasport.dEnd.HasValue ? pasport.dEnd.Value.ToString("yyyy.MM.dd HH:mm:ss") : "", + + HasPasport = pasport.hasPasport, + Kod_npl = pasport.kod_npl, + Nplav = pasport.nplav, + Rm = pasport.rm, + Splav = pasport.splav, + IS = pasport.iS, + Notd = pasport.notd, + Vessl = pasport.vessl, + Diam = pasport.diam, + Prpl = pasport.prpl, + Tin = pasport.tin, + Dzap = pasport.dzap, + Dlog = pasport.dlog, + Last = pasport.last, + Dlper = pasport.dlper, + Nazn = pasport.nazn, + Kompl = pasport.kompl, + Izl = pasport.izl, + Robm = pasport.robm, + Rizol = pasport.rizol, + Dkr = pasport.dkr, + Nkon = pasport.nkon, + Pos = pasport.pos, + Ukaz = pasport.ukaz, + Zakaz = pasport.zakaz, + Kat = pasport.kat, + Pril = pasport.pril, + Rezerved = pasport.rezerved, + }; + } + catch (Exception e) + { + log.Warn(e); + return new PasportGetPasportClient() + { + HasData = false, + HasPasport = false + }; + } + } + } diff --git a/ApiServer/Diagrams/ClassDiagram1.cd b/ApiServer/Diagrams/ClassDiagram1.cd new file mode 100644 index 0000000..cbcef76 --- /dev/null +++ b/ApiServer/Diagrams/ClassDiagram1.cd @@ -0,0 +1,171 @@ + + + + + + AAAQAAAAAAAAAAABAAACCAAAAIAAAAAAAAAAAAAAAAA= + Controllers\DateController.cs + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAgAAAAAAA= + Structures\Analog.cs + + + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAEAAAAAAAA= + Structures\Analog.cs + + + + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEABAAAAAA= + Structures\Discret.cs + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEABAAAAAA= + Structures\Protect.cs + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEAAAAAAAA= + Structures\TechCycle.cs + + + + \ No newline at end of file diff --git a/ApiServer/Diagrams/ClassDiagram2.cd b/ApiServer/Diagrams/ClassDiagram2.cd new file mode 100644 index 0000000..433c330 --- /dev/null +++ b/ApiServer/Diagrams/ClassDiagram2.cd @@ -0,0 +1,25 @@ + + + + + + AAAAAAAAAAAAAAgAgAAACEIAAIAAAAAAAAAECAAAABA= + WorkWithFiles.cs + + + + + + AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAgAAACAAAAAA= + Startup.cs + + + + + + AAAAAIAAAAgAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA= + Program.cs + + + + \ No newline at end of file diff --git a/ApiServer/Diagrams/ClassDiagram3.cd b/ApiServer/Diagrams/ClassDiagram3.cd new file mode 100644 index 0000000..d01912e --- /dev/null +++ b/ApiServer/Diagrams/ClassDiagram3.cd @@ -0,0 +1,237 @@ + + + + + + AAQAAAAAAAAAAAAAiAAACAAAAIAAIAAAEAAAAAAAAAA= + Controllers\ParamsController.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + AAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAEAAAAAABAAAAAAEAAAAAQAAAACAgACAAEIAAAAEAA= + Parametrs\Analog.cs + + + + + + AAAAAAAAAQAAAAAAAAAAAAQAAAAAgAAAAAEAAAAAEAA= + Parametrs\Discret.cs + + + + + + + + + AAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAA= + Parametrs\Discret.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAgAAAAAAAAAAAAAAAA= + Parametrs\Metrics.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAgAAAAAEAAAAAAAA= + Parametrs\Protect.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAEAgAAAAAA= + Parametrs\States.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAABAAAAAA= + Parametrs\States.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAEAAAAAAAA= + Parametrs\TechCycle.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAAAAAA= + Parametrs\TechCycle.cs + + + + + + + + + + + + + AAAAAEAAAAEAAAAACgAgCAAAIAAAAAAAEEAAAAAAAEA= + Parametrs\Analog.cs + + + + + + + \ No newline at end of file diff --git a/ApiServer/Diagrams/ClassDiagram4.cd b/ApiServer/Diagrams/ClassDiagram4.cd new file mode 100644 index 0000000..5f231b9 --- /dev/null +++ b/ApiServer/Diagrams/ClassDiagram4.cd @@ -0,0 +1,39 @@ + + + + + + AAAAEAgAAAAAAAAAAAAACAAAAAAAAEAAAAAAAAAAAAI= + Controllers\PasportController.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAA= + ApiStruct\Pasport.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQA= + ApiStruct\Pasport.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAABAAAAAAAAAAA= + ApiStruct\Pasport.cs + + + + + + UAAgEAIAEQgEIAACADAAggAIIACAARAAIBACAoIBAgQ= + ApiStruct\Pasport.cs + + + + \ No newline at end of file diff --git a/ApiServer/Diagrams/ClassDiagram_global.cd b/ApiServer/Diagrams/ClassDiagram_global.cd new file mode 100644 index 0000000..7a24fde --- /dev/null +++ b/ApiServer/Diagrams/ClassDiagram_global.cd @@ -0,0 +1,380 @@ + + + + + + AAAAAAAAAAAAAAgAgAAACEIAAIAAAAAAAAAECAAAABA= + WorkWithFiles.cs + + + + + + AAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAgAAACAAAAAA= + Startup.cs + + + + + + AAAAAIAAAAgAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA= + Program.cs + + + + + + AAAQAAAAAAAAAAABAAACCAAAAIAAAAAAAAAAAAAAAAA= + Controllers\DateController.cs + + + + + + AAQAAAAAAAAAAAAAiAAACAAAAIAAIAAAEAAAAAAAAAA= + Controllers\ParamsController.cs + + + + + + AAAAEAgAAAAAAAAAAAAACAAAAAAAAEAAAAAAAAAAAAI= + Controllers\PasportController.cs + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAIAAQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAA= + ApiStruct\Date.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + AAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAA= + ApiStruct\Params.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAA= + ApiStruct\Pasport.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQA= + ApiStruct\Pasport.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAABAAAAAAAAAAA= + ApiStruct\Pasport.cs + + + + + + UAAgEAIAEQgEIAACADAAggAIIACAARAAIBACAoIBAgQ= + ApiStruct\Pasport.cs + + + + + + AAEAAAAAABAAAAAAEAAAAAQAAAACAgACAAEIAAAAEAA= + Parametrs\Analog.cs + + + + + + AAAAAAAAAQAAAAAAAAAAAAQAAAAAgAAAAAEAAAAAEAA= + Parametrs\Discret.cs + + + + + + + + + AAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAA= + Parametrs\Discret.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAgAAAAAAAAAAAAAAAA= + Parametrs\Metrics.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAgAAAAAEAAAAAAAA= + Parametrs\Protect.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAEAgAAAAAA= + Parametrs\States.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAABAAAAAA= + Parametrs\States.cs + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAEAAAAAAAA= + Parametrs\TechCycle.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAAAAAA= + Parametrs\TechCycle.cs + + + + + + AAAAAEAAAAEAAAAACgAgCAAAIAAAAAAAEEAAAAAAAEA= + Parametrs\Analog.cs + + + + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAAgAAAAAAA= + Structures\Analog.cs + + + + + + + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAEAAAAAAAA= + Structures\Analog.cs + + + + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEABAAAAAA= + Structures\Discret.cs + + + + + + AAAAAAAAAAAAAAAgAAAAAAAAAAAABAAAAAAAAAIAAAA= + Structures\Discret.cs + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEABAAAAAA= + Structures\Protect.cs + + + + + + AAAAAAAAACAAAAAgAAAAAAAAAAAAAAAAAAEAAAAAAAA= + Structures\TechCycle.cs + + + + \ No newline at end of file diff --git a/ApiServer/Parametrs/Analog.cs b/ApiServer/Parametrs/Analog.cs new file mode 100644 index 0000000..ae86ae8 --- /dev/null +++ b/ApiServer/Parametrs/Analog.cs @@ -0,0 +1,161 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using NLog; + +namespace ApiServer.Parametrs +{ + public class AnalogParams + { + public int Index { get; set; } + public bool ShowDefault { get; set; } + public bool Skip { get; set; } + public string Name { get; set; } + public string Sname { get; set; } + public string Metric { get; set; } + public double? Min { get; set; } + public double? Max { get; set; } + public double Mul { get; set; } + public int[] Bytes {get;set;} + + } +} + +namespace ApiServer +{ + public static partial class Configuration + { + private static Logger log = LogManager.GetCurrentClassLogger(); + public static Dictionary r_analogParams = null; + public static AnalogParams[] GetAnalogParams(string name_analog) + { + log.Info("Ask analog parasm: " + name_analog); + if (r_analogParams != null && r_analogParams.ContainsKey(name_analog)) + { + log.Info("Exist: " + name_analog); + return r_analogParams[name_analog]; + } + + var result = new List(); + var list_files = Directory.GetFiles( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "Analog" + ) + ); + foreach (var file in list_files) { + log.Info("Try read " + file); + var json_conf = + JObject.Parse( + File.ReadAllText( + file + ) + ); + if (!json_conf.ContainsKey(name_analog)) + continue; + + var analog = json_conf.Value(name_analog); + if (analog.ContainsKey("struct")) + { + var struct_arr = analog.Value("struct"); + foreach (JObject struct_el in struct_arr) + { + var analog_param = GetAnalogParam(struct_el); + if (analog_param != null) + if (result.Find(x => x.Index == analog_param.Index) == null) + result.Add(analog_param); + } + } + + if (analog.ContainsKey("parent")) + { + var parent_list = analog.Value("parent"); + for(var i = parent_list.Count - 1; i >= 0; i--) + { + var parent_states = GetAnalogParams(parent_list[i].Value()); + foreach (var state in parent_states) + { + if (state != null) + if (result.Find(x => x.Index == state.Index) == null) + result.Add(state); + } + } + } + break; + } + if (r_analogParams == null) + r_analogParams = new Dictionary(); + if (r_analogParams.ContainsKey(name_analog)) + r_analogParams[name_analog] = result.ToArray(); + else + r_analogParams.Add(name_analog, result.ToArray()); + return result.ToArray(); + } + private static AnalogParams GetAnalogParam(JObject data) + { + if ( data == null || !data.ContainsKey("index")) + return null; + var index = data.Value("index"); + var result = new AnalogParams() + { + Index = index, + Name = "Аналог " + index, + Sname = "Аналог " + index, + Min = null, + Max = null, + Mul = 1, + Metric = "УЕ", + Skip = false, + ShowDefault = false, + Bytes = new int[0] + }; + + if (data.ContainsKey("skip")) + { + var skip = data.Value("skip"); + if (skip) + { + result.Skip = true; + return result; + } + } + if (data.ContainsKey("name")) + result.Name = data.Value("name"); + if (data.ContainsKey("s_name")) + result.Sname = data.Value("s_name"); + if (data.ContainsKey("metric")) + result.Metric = data.Value("metric"); + if (data.ContainsKey("min")) + result.Min = data.Value("min"); + if (data.ContainsKey("max")) + result.Max = data.Value("max"); + if (data.ContainsKey("mul")) + result.Mul = data.Value("mul"); + if (data.ContainsKey("show_default")) + result.ShowDefault = data.Value("show_default"); + + if (data.ContainsKey("bytes")) + { + var bytes = data.Value("bytes"); + var arr = new List(); + try + { + for (var i = 0; i < bytes.Count; i++) + arr.Add(bytes[i].Value()); + result.Bytes = arr.ToArray(); + } + catch + { + result.Bytes = new int[0]; + } + } + return result; + } + } +} diff --git a/ApiServer/Parametrs/Discret.cs b/ApiServer/Parametrs/Discret.cs new file mode 100644 index 0000000..316ff13 --- /dev/null +++ b/ApiServer/Parametrs/Discret.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace ApiServer.Parametrs +{ + public class DiscretParams + { + public int Index { get; set; } + public bool Skip { get; set; } + public string Name { get; set; } + public ByteBit[] Bits {get;set;} + public string StateStruct { get; set; } + } + public class ByteBit + { + public int ByteIndex { get; set; } + public byte BitIndex { get; set; } + } +} + +namespace ApiServer +{ + public static partial class Configuration + { + public static DiscretParams[] GetDiscretParams(string name_discret) + { + var result = new List(); + var list_files = Directory.GetFiles( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "Discret" + ) + ); + foreach (var file in list_files) { + var json_conf = + JObject.Parse( + File.ReadAllText( + file + ) + ); + if (!json_conf.ContainsKey(name_discret)) + continue; + + var discret = json_conf.Value(name_discret); + if (discret.ContainsKey("struct")) + { + var struct_arr = discret.Value("struct"); + foreach (JObject struct_el in struct_arr) + { + var discret_param = GetDiscretParam(struct_el); + if (discret_param != null) + if (result.Find(x => x.Index == discret_param.Index) == null) + result.Add(discret_param); + } + } + + if (discret.ContainsKey("parent")) + { + var parent_list = discret.Value("parent"); + for(var i = parent_list.Count - 1; i >= 0; i--) + { + var parent_states = GetDiscretParams(parent_list[i].Value()); + foreach (var state in parent_states) + { + if (state != null) + if (result.Find(x => x.Index == state.Index) == null) + result.Add(state); + } + } + } + break; + } + return result.ToArray(); + } + private static DiscretParams GetDiscretParam(JObject data) + { + if ( + data == null || + !data.ContainsKey("index")) + return null; + if (data.ContainsKey("skip")) + { + var skip = data.Value("skip"); + if (skip) + { + return new DiscretParams() + { + Index = data.Value("index"), + Skip = true + }; + } + } + if ( + data == null || + !data.ContainsKey("index") || + !data.ContainsKey("name") || + !data.ContainsKey("state_struct") || + !data.ContainsKey("bits") + ) + return null; + var bits = data.Value("bits"); + var arr = new List(); + try + { + for (var i = 0; i < bits.Count; i++) + { + if ( + bits[i] == null || + !((JObject)bits[i]).ContainsKey("byte_index") || + !((JObject)bits[i]).ContainsKey("bit_index") + ) + continue; + arr.Add(new ByteBit() + { + ByteIndex = ((JObject)bits[i]).Value("byte_index"), + BitIndex = ((JObject)bits[i]).Value("bit_index") + }); + } + } + catch + { + return null; + } + + return new DiscretParams() + { + Index = data.Value("index"), + Skip = false, + Name = data.Value("name"), + Bits = arr.ToArray(), + StateStruct = data.Value("state_struct") + }; + } + } +} diff --git a/ApiServer/Parametrs/Metrics.cs b/ApiServer/Parametrs/Metrics.cs new file mode 100644 index 0000000..1ed7a6f --- /dev/null +++ b/ApiServer/Parametrs/Metrics.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace ApiServer.Parametrs +{ + public class Metric + { + public string Name { get; set; } + public bool Log { get; set; } + } +} + +namespace ApiServer +{ + public static partial class Configuration + { + public static Metric[] GetMetricsArray() + { + var result = new List(); + var json_conf = + JObject.Parse( + File.ReadAllText( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "Metrics.json" + ) + ) + ); + var list_objects = json_conf.GetEnumerator(); + while (list_objects.MoveNext()) + { + try + { + var name = list_objects.Current.Key; + var log = (bool)list_objects.Current.Value; + if (result.FindIndex(x => x.Name == name) == -1) + result.Add(new Metric() + { + Name = name, + Log = log + }); + } + catch + { + continue; + } + } + return result.ToArray(); + } + } +} \ No newline at end of file diff --git a/ApiServer/Parametrs/Protect.cs b/ApiServer/Parametrs/Protect.cs new file mode 100644 index 0000000..cda9d8b --- /dev/null +++ b/ApiServer/Parametrs/Protect.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace ApiServer.Parametrs +{ + public class ProtectState + { + public byte Index { get; set; } + public string Name { get; set; } + public string StateStruct { get; set; } + } +} + +namespace ApiServer +{ + public static partial class Configuration + { + public static ProtectState[] GetProtectState(string name_protect) + { + var result = new List(); + var list_files = Directory.GetFiles( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "Protect" + ) + ); + foreach (var file in list_files) { + var json_conf = + JObject.Parse( + File.ReadAllText( + file + ) + ); + if (!json_conf.ContainsKey(name_protect)) + continue; + + var protect = json_conf.Value(name_protect); + if (protect.ContainsKey("struct")) + { + var struct_arr = protect.Value("struct"); + foreach (JObject struct_el in struct_arr) + { + var protect_state = GetProtect(struct_el); + if (protect_state != null) + if (result.Find(x => x.Index == protect_state.Index) == null) + result.Add(protect_state); + } + } + + if (protect.ContainsKey("parent")) + { + var parent_list = protect.Value("parent"); + for(var i = parent_list.Count - 1; i >= 0; i--) + { + var parent_states = GetProtectState(parent_list[i].Value()); + foreach (var state in parent_states) + { + if (state != null) + if (result.Find(x => x.Index == state.Index) == null) + result.Add(state); + } + } + } + break; + } + return result.ToArray(); + } + + private static ProtectState GetProtect(JObject data) + { + if ( + data == null || + !data.ContainsKey("index") || + !data.ContainsKey("name") || + !data.ContainsKey("state_struct") + ) + return null; + + return new ProtectState() + { + Index = data.Value("index"), + Name = data.Value("name"), + StateStruct = data.Value("state_struct") + }; + } + } +} diff --git a/ApiServer/Parametrs/States.cs b/ApiServer/Parametrs/States.cs new file mode 100644 index 0000000..04ce058 --- /dev/null +++ b/ApiServer/Parametrs/States.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace ApiServer.Parametrs +{ + public class State + { + public byte Index { get; set; } + public string Name { get; set; } + public string Color { get; set; } + } + public class StateStruct + { + public string Name { get; set; } + public State[] States { get; set; } + } + +} + +namespace ApiServer +{ + public static partial class Configuration + { + public static StateStruct[] GetStateStructArray() + { + var result = new List(); + var json_conf = + JObject.Parse( + File.ReadAllText( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "StateStruct.json" + ) + ) + ); + var list_objects = json_conf.GetEnumerator(); + while (list_objects.MoveNext()) + { + var sub_res = GetStateStruct( + list_objects.Current.Key, + (JArray)list_objects.Current.Value + ); + if (sub_res != null) + result.Add(sub_res); + } + return result.ToArray(); + } + public static StateStruct GetStateStruct(string name) + { + var json_conf = + JObject.Parse( + File.ReadAllText( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "StateStruct.json" + ) + ) + ); + if (!json_conf.ContainsKey(name)) + return null; + return GetStateStruct(name, json_conf.Value(name)); + } + private static StateStruct GetStateStruct(string name, JArray data) + { + if (data == null) + return null; + var result = new StateStruct() { Name = name }; + var sub_res = new List(); + foreach (JObject j_state_struct in data) + { + var state = GetState(j_state_struct); + if (state == null) + continue; + sub_res.Add(state); + } + result.States = sub_res.ToArray(); + return result; + } + private static State GetState(JObject data) + { + if ( + data == null || + !data.ContainsKey("index") || + !data.ContainsKey("name") || + !data.ContainsKey("color") + ) + return null; + + return new State() + { + Index = data.Value("index"), + Name = data.Value("name"), + Color = data.Value("color") + }; + } + } +} diff --git a/ApiServer/Parametrs/TechCycle.cs b/ApiServer/Parametrs/TechCycle.cs new file mode 100644 index 0000000..99ddbd8 --- /dev/null +++ b/ApiServer/Parametrs/TechCycle.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using ApiServer.Parametrs; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace ApiServer.Parametrs +{ + public class TechCycleName + { + public int Index { get; set; } + public string Name { get; set; } + } + public class TechCycleColor + { + public int Index { get; set; } + public string Color { get; set; } + } + +} + +namespace ApiServer +{ + public static partial class Configuration + { + public static TechCycleName[] GetTechCycleNames() + { + var result = new List(); + var json_conf = + JObject.Parse( + File.ReadAllText( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "TechCycle.json" + ) + ) + ); + if (!json_conf.ContainsKey("tech_cycle_conf")) + return result.ToArray(); + var tc_array = json_conf.Value("tech_cycle_conf"); + foreach(JObject tc in tc_array) + { + int? index = null; + string name = null; + if (tc.ContainsKey("index")) + index = tc.Value("index"); + if (tc.ContainsKey("name")) + name = tc.Value("name"); + if (!string.IsNullOrEmpty(name) && index.HasValue) + result.Add( + new TechCycleName() + { + Index = index.Value, + Name = name + } + ); + } + return result.ToArray(); + } + public static TechCycleColor[] GetTechCycleColor() + { + var result = new List(); + var json_conf = + JObject.Parse( + File.ReadAllText( + Path.Combine( + Directory.GetCurrentDirectory(), + "Config", + "TechCycle.json" + ) + ) + ); + if (!json_conf.ContainsKey("tech_cycle_conf")) + return result.ToArray(); + var tc_array = json_conf.Value("tech_cycle_conf"); + foreach (JObject tc in tc_array) + { + int? index = null; + string color = null; + if (tc.ContainsKey("index")) + index = tc.Value("index"); + if (tc.ContainsKey("color")) + color = tc.Value("color"); + if (!string.IsNullOrEmpty(color) && index.HasValue) + result.Add( + new TechCycleColor() + { + Index = index.Value, + Color = color + } + ); + } + return result.ToArray(); + } + } +} diff --git a/ApiServer/Structures/Analog.cs b/ApiServer/Structures/Analog.cs new file mode 100644 index 0000000..096f807 --- /dev/null +++ b/ApiServer/Structures/Analog.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace ApiServer.Structures +{ + public class Analog + { + public string Start { get { return start.ToString("yyyy.MM.dd HH:mm:ss"); } } + public DateTime start = new DateTime(); + public double? Value { get; set; } + } + public class AnalogArr + { + public int Index { get; set; } + public Analog[] Analogs { get; set; } + } +} diff --git a/ApiServer/Structures/Discret.cs b/ApiServer/Structures/Discret.cs new file mode 100644 index 0000000..d6c81f7 --- /dev/null +++ b/ApiServer/Structures/Discret.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace ApiServer.Structures +{ + public class Discret + { + public int Index { get; set; } + public string Start { get { return start.ToString("yyyy.MM.dd HH:mm:ss"); } } + public DateTime start = new DateTime(); + public byte? State { get; set; } + } + public class DiscretMatrix + { + public string Dt { get { return start.ToString("yyyy.MM.dd HH:mm:ss"); } } + public DateTime start = new DateTime(); + public byte?[] M { get; set; } + } +} diff --git a/ApiServer/Structures/Protect.cs b/ApiServer/Structures/Protect.cs new file mode 100644 index 0000000..4dc6bbf --- /dev/null +++ b/ApiServer/Structures/Protect.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace ApiServer.Structures +{ + public class Protect + { + public byte Index { get; set; } + public byte State { get; set; } + public DateTime start; + public string Start { get { return start.ToString("yyyy.MM.dd HH.mm.ss.fff"); } } + } +} diff --git a/ApiServer/Structures/TechCycle.cs b/ApiServer/Structures/TechCycle.cs new file mode 100644 index 0000000..f05a85a --- /dev/null +++ b/ApiServer/Structures/TechCycle.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace ApiServer.Structures +{ + public class TechCycle + { + public sbyte Index { get; set; } + public string Start { get { return start.ToString("yyyy.MM.dd HH:mm:ss"); } } + public DateTime start = new DateTime(); + + public TechCycle(DateTime date, string line) + { + var splits = line.Split('\t'); + if (splits[0] == "00") + this.Index = -1; + else + this.Index = sbyte.Parse(splits[0]); + var times = splits[1].Split(":"); + this.start = new DateTime( + date.Year, + date.Month, + date.Day, + int.Parse(times[0]), + int.Parse(times[1]), + int.Parse(times[2]) + ); + } + } +} diff --git a/ApiServer/WorkWithFiles.cs b/ApiServer/WorkWithFiles.cs new file mode 100644 index 0000000..1efe74a --- /dev/null +++ b/ApiServer/WorkWithFiles.cs @@ -0,0 +1,544 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using ICSharpCode.SharpZipLib.GZip; +using ICSharpCode.SharpZipLib.Tar; +using System.IO; +using ApiServer.Structures; +using NLog; + +namespace ApiServer +{ + public static class WorkWithFiles + { + private static Logger log = LogManager.GetCurrentClassLogger(); + + public static string[] GetFile(string fileName) + { + var vdp = fileName.Substring(9, 2); + var dir_archive = Path.Combine( + Directory.GetCurrentDirectory(), + "data", + "data", + fileName.Substring(0,4), + fileName.Substring(4, 2), + fileName.Substring(6, 2) + ); + var tmp = Path.Combine( + Directory.GetCurrentDirectory(), + "temp", + System.Guid.NewGuid().ToString() + ); + + if (!Directory.Exists(tmp)) + Directory.CreateDirectory(tmp); + var flag_exist = false; + var tar_gz = false; + if (File.Exists(Path.Combine(dir_archive, vdp + ".tar.gz"))) + { + flag_exist = true; + tar_gz = true; + dir_archive = Path.Combine(dir_archive, vdp + ".tar.gz"); + } + if (File.Exists(Path.Combine(dir_archive, vdp + ".tar"))) + { + flag_exist = true; + dir_archive = Path.Combine(dir_archive, vdp + ".tar"); + } + if (!flag_exist) + return Array.Empty(); + if (tar_gz) + ExtractTarGZ(dir_archive, tmp); + else + ExtractTar(dir_archive, tmp); + if (!File.Exists(Path.Combine(tmp, fileName))) + { + Directory.Delete(tmp, true); + return Array.Empty(); + } + var result = File.ReadAllLines(Path.Combine(tmp, fileName)); + Directory.Delete(tmp, true); + return result; + } + public static byte[] GetFileBytes(string fileName) + { + var vdp = fileName.Substring(9, 2); + var dir_archive = Path.Combine( + Directory.GetCurrentDirectory(), + "data", + "data", + fileName.Substring(0, 4), + fileName.Substring(4, 2), + fileName.Substring(6, 2) + ); + var tmp = Path.Combine( + Directory.GetCurrentDirectory(), + "temp", + System.Guid.NewGuid().ToString() + ); + log.Info("Path: " + dir_archive); + if (!Directory.Exists(tmp)) + Directory.CreateDirectory(tmp); + var flag_exist = false; + var tar_gz = false; + if (File.Exists(Path.Combine(dir_archive, vdp + ".tar.gz"))) + { + flag_exist = true; + tar_gz = true; + dir_archive = Path.Combine(dir_archive, vdp + ".tar.gz"); + } + if (File.Exists(Path.Combine(dir_archive, vdp + ".tar"))) + { + flag_exist = true; + dir_archive = Path.Combine(dir_archive, vdp + ".tar"); + } + if (!flag_exist) + return Array.Empty(); + if (tar_gz) + ExtractTarGZ(dir_archive, tmp); + else + ExtractTar(dir_archive, tmp); + if (!File.Exists(Path.Combine(tmp, fileName))) + { + Directory.Delete(tmp, true); + return Array.Empty(); + } + var result = File.ReadAllBytes(Path.Combine(tmp, fileName)); + Directory.Delete(tmp, true); + return result; + } + + private static void ExtractTarGZ(String gzArchiveName, String destFolder) + { + using (var a = (Stream)File.OpenRead(gzArchiveName)) + using (var b = (Stream)new GZipInputStream(a)) + using (var c = TarArchive.CreateInputTarArchive(b)) + c.ExtractContents(destFolder); + } + private static void ExtractTar(String tarFileName, String destFolder) + { + using (var a = (Stream)File.OpenRead(tarFileName)) + using (var b = TarArchive.CreateInputTarArchive(a)) + b.ExtractContents(destFolder); + } + + public static Protect[] GetProtects(DateTime date, int vdp) + { + var result = new List(); + var byte_arr = GetFileBytes( + date.Year.ToString("D4") + + date.Month.ToString("D2") + + date.Day.ToString("D2") + + "." + + vdp.ToString("D2") + + "4" + ); + for (var i = 0; i < byte_arr.Length; i++) + { + if (i + 3 >= byte_arr.Length) + break; + var unix_date = BitConverter.ToUInt32(byte_arr, i); + i += 4; + var date_time = new DateTime(1970, 1, 1, 0, 0, 0, 0); + date_time = date_time.AddSeconds(unix_date).ToLocalTime(); + + if (i + 3 >= byte_arr.Length) + break; + var nanosec = BitConverter.ToUInt32(byte_arr, i); + i += 4; + date_time.AddMilliseconds(nanosec / 1000000); + + while (byte_arr[i] != 0xff) + { + if (i >= byte_arr.Length) + break; + var index = byte_arr[i]; + i++; + + if (i >= byte_arr.Length) + break; + var state = byte_arr[i]; + i++; + + result.Add( + new Protect() + { + Index = index, + start = date_time, + State = state + } + ); + } + } + return result.ToArray(); + } + public static Discret[] GetDiscrets(DateTime date, int vdp) + { + var desc_struct = Configuration.GetDiscretParams(vdp.ToString("D2")); + var result = new List(); + var byte_arr = GetFileBytes( + date.Year.ToString("D4") + + date.Month.ToString("D2") + + date.Day.ToString("D2") + + "." + + vdp.ToString("D2") + + "1" + ); + + var date_bytes_struct = new List<(DateTime dt, byte?[] arr)>(); + var curr_date = new DateTime(date.Year, date.Month, date.Day, 0, 0, 0); + var curr_byte_arr = new List(); + var halfsec = 0D; + var curr_byte = 0; + while (curr_byte < byte_arr.Length) + { + switch (byte_arr[curr_byte]) + { + case 0xfb: + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfc: + curr_byte_arr = new List(); + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfe: + curr_byte++; + if (curr_byte + 1 >= byte_arr.Length) + { + curr_byte++; + break; + } + halfsec += BitConverter.ToInt16(byte_arr, curr_byte); + curr_byte += 2; + break; + case 0xff: + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + halfsec++; + curr_byte++; + break; + default: + while (curr_byte_arr.Count <= byte_arr[curr_byte]) + curr_byte_arr.Add(null); + curr_byte++; + if (curr_byte >= byte_arr.Length) + break; + curr_byte_arr[byte_arr[curr_byte - 1]] = byte_arr[curr_byte]; + curr_byte++; + break; + } + } + foreach (var dm in date_bytes_struct) + { + foreach (var dp in desc_struct) + { + if (dp.Skip) + continue; + byte? state = 0; + for (var i = 0; i < dp.Bits.Length; i++) + { + if ( + dm.arr.Length <= dp.Bits[i].ByteIndex || + !dm.arr[dp.Bits[i].ByteIndex].HasValue + ) + { + state = null; + break; + } + var curr_bit = (dm.arr[dp.Bits[i].ByteIndex].Value >> dp.Bits[i].BitIndex) & 1; + state += (byte)(curr_bit * Math.Pow(2, i)); + } + var last = result.FindLastIndex(x => x.Index == dp.Index); + if (last != -1 && result[last].State == state) + continue; + result.Add(new Discret() + { + Index = dp.Index, + start = dm.dt, + State = state + }); + } + } + return result.ToArray(); + } + public static AnalogArr[] GetAnalogs(DateTime date, int vdp) + { + var analog_struct = Configuration.GetAnalogParams(vdp.ToString("D2")); + var result = new List(); + var byte_arr = GetFileBytes( + date.Year.ToString("D4") + + date.Month.ToString("D2") + + date.Day.ToString("D2") + + "." + + vdp.ToString("D2") + + "1" + ); + + var date_bytes_struct = new List<(DateTime dt, byte?[] arr)>(); + var curr_date = new DateTime(date.Year, date.Month, date.Day, 0, 0, 0); + var curr_byte_arr = new List(); + var halfsec = 0D; + var curr_byte = 0; + while (curr_byte < byte_arr.Length) + { + switch (byte_arr[curr_byte]) + { + case 0xfb: + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfc: + curr_byte_arr = new List(); + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfe: + curr_byte++; + if (curr_byte + 1 >= byte_arr.Length) + { + curr_byte++; + break; + } + halfsec += BitConverter.ToInt16(byte_arr, curr_byte); + curr_byte += 2; + break; + case 0xff: + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + halfsec++; + curr_byte++; + break; + default: + while (curr_byte_arr.Count <= byte_arr[curr_byte]) + curr_byte_arr.Add(null); + curr_byte++; + if (curr_byte >= byte_arr.Length) + break; + curr_byte_arr[byte_arr[curr_byte - 1]] = byte_arr[curr_byte]; + curr_byte++; + break; + } + } + var sub_res = new Dictionary>(); + foreach (var dm in date_bytes_struct) + { + foreach (var dp in analog_struct) + { + if (dp.Skip) + continue; + double? value = 0; + var val_arr = new List(); + for (var i = 0; i < dp.Bytes.Length; i++) + { + if ( + dm.arr.Length <= dp.Bytes[i] || + !dm.arr[dp.Bytes[i]].HasValue + ) + { + value = null; + break; + } + val_arr.Add(dm.arr[dp.Bytes[i]].Value); + } + + if (val_arr != null) + { + if (val_arr.Count == 1) + value = val_arr[0]; + else if (val_arr.Count == 2) + value = BitConverter.ToInt16(val_arr.ToArray(), 0); + else if (val_arr.Count == 4) + value = BitConverter.ToInt32(val_arr.ToArray(), 0); + else if (val_arr.Count == 8) + value = BitConverter.ToInt64(val_arr.ToArray(), 0); + else + for (var i = 0; i < val_arr.Count; i++) + value += (val_arr[i] * Math.Pow(256, i)); + } + if (value != null) + { + value = Math.Round(value.Value); + value = value.Value * dp.Mul; + } + + if (!sub_res.ContainsKey(dp.Index)) + sub_res.Add(dp.Index, new List()); + if (sub_res[dp.Index].Count != 0 && + sub_res[dp.Index][sub_res[dp.Index].Count - 1].Value == value) + continue; + sub_res[dp.Index].Add(new Analog() + { + start = dm.dt, + Value = value + }); + } + } + + foreach (var d in sub_res) + result.Add(new AnalogArr() + { + Index = d.Key, + Analogs = d.Value.ToArray() + }); + return result.ToArray(); + } + + + public static DiscretMatrix[] GetDiscretsMatrix(DateTime date, int vdp) + { + log.Info("Load discret struct for vpd " + vdp); + var desc_struct = Configuration.GetDiscretParams(vdp.ToString("D2")); + var result = new List(); + log.Info("Load file " + + date.Year.ToString("D4") + + date.Month.ToString("D2") + + date.Day.ToString("D2") + + "." + + vdp.ToString("D2") + + "1"); + var byte_arr = GetFileBytes( + date.Year.ToString("D4") + + date.Month.ToString("D2") + + date.Day.ToString("D2") + + "." + + vdp.ToString("D2") + + "1" + ); + + var date_bytes_struct = new List<(DateTime dt, byte?[] arr)>(); + var curr_date = new DateTime(date.Year, date.Month, date.Day, 0, 0, 0); + var curr_byte_arr = new List(); + var halfsec = 0D; + var curr_byte = 0; + log.Info("Parse file to structs."); + while (curr_byte < byte_arr.Length) + { + switch (byte_arr[curr_byte]) + { + case 0xfb: + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfc: + curr_byte_arr = new List(); + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + curr_byte++; + if (curr_byte + 3 >= byte_arr.Length) + { + curr_byte += 3; + break; + } + halfsec = BitConverter.ToUInt32(byte_arr, curr_byte); + curr_byte += 4; + break; + case 0xfe: + curr_byte++; + if (curr_byte + 1 >= byte_arr.Length) + { + curr_byte++; + break; + } + halfsec += BitConverter.ToInt16(byte_arr, curr_byte); + curr_byte += 2; + break; + case 0xff: + date_bytes_struct.Add(( + curr_date.AddSeconds(halfsec / 2), + curr_byte_arr.ToArray() + )); + halfsec++; + curr_byte++; + break; + default: + while (curr_byte_arr.Count <= byte_arr[curr_byte]) + curr_byte_arr.Add(null); + curr_byte++; + if (curr_byte >= byte_arr.Length) + break; + curr_byte_arr[byte_arr[curr_byte - 1]] = byte_arr[curr_byte]; + curr_byte++; + break; + } + } + + var b_matrix = new List(); + foreach(var d_slice in date_bytes_struct) + { + var sub_res = new DiscretMatrix() { start = d_slice.dt }; + foreach (var d_struct in desc_struct) + { + while (b_matrix.Count <= d_struct.Index) + b_matrix.Add(null); + byte? state = 0; + for (var i = 0; i < d_struct.Bits.Length; i++) + { + if ( + d_slice.arr.Length <= d_struct.Bits[i].ByteIndex || + !d_slice.arr[d_struct.Bits[i].ByteIndex].HasValue + ) + { + state = null; + break; + } + var curr_bit = (d_slice.arr[d_struct.Bits[i].ByteIndex].Value >> d_struct.Bits[i].BitIndex) & 1; + state += (byte)(curr_bit * Math.Pow(2, i)); + } + b_matrix[d_struct.Index] = state; + } + sub_res.M = b_matrix.ToArray(); + result.Add(sub_res); + } + + return result.ToArray(); + } + + } +} diff --git a/ApiServer/bin/Debug/net5.0/ApiServer.deps.json b/ApiServer/bin/Debug/net5.0/ApiServer.deps.json index da69810..84d727e 100644 --- a/ApiServer/bin/Debug/net5.0/ApiServer.deps.json +++ b/ApiServer/bin/Debug/net5.0/ApiServer.deps.json @@ -36,6 +36,7 @@ "DataClient": "0.0.3", "NLog": "4.7.10", "Newtonsoft.Json": "13.0.1", + "SharpZipLib": "1.3.3", "Microsoft.AspNetCore.Antiforgery": "5.0.0.0", "Microsoft.AspNetCore.Authentication.Abstractions": "5.0.0.0", "Microsoft.AspNetCore.Authentication.Cookies": "5.0.0.0", @@ -392,6 +393,17 @@ "lib/net5.0/NLog.Extensions.Logging.dll": {} } }, + "SharpZipLib/1.3.3": { + "runtime": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": { + "assemblyVersion": "1.3.3.11", + "fileVersion": "1.3.3.11" + } + }, + "compile": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {} + } + }, "DataClient/0.0.3": { "dependencies": { "NLog": "4.7.10", @@ -2181,6 +2193,13 @@ "path": "nlog.extensions.logging/1.7.2", "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" }, + "SharpZipLib/1.3.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-N8+hwhsKZm25tDJfWpBSW7EGhH/R7EMuiX+KJ4C4u+fCWVc1lJ5zg1u3S1RPPVYgTqhx/C3hxrqUpi6RwK5+Tg==", + "path": "sharpziplib/1.3.3", + "hashPath": "sharpziplib.1.3.3.nupkg.sha512" + }, "DataClient/0.0.3": { "type": "project", "serviceable": false, diff --git a/ApiServer/bin/Debug/net5.0/ApiServer.dll b/ApiServer/bin/Debug/net5.0/ApiServer.dll index 0f209cf..72fe2fb 100644 Binary files a/ApiServer/bin/Debug/net5.0/ApiServer.dll and b/ApiServer/bin/Debug/net5.0/ApiServer.dll differ diff --git a/ApiServer/bin/Debug/net5.0/ApiServer.exe b/ApiServer/bin/Debug/net5.0/ApiServer.exe index b796af4..055a749 100644 Binary files a/ApiServer/bin/Debug/net5.0/ApiServer.exe and b/ApiServer/bin/Debug/net5.0/ApiServer.exe differ diff --git a/ApiServer/bin/Debug/net5.0/ApiServer.pdb b/ApiServer/bin/Debug/net5.0/ApiServer.pdb index 14663bd..f1127df 100644 Binary files a/ApiServer/bin/Debug/net5.0/ApiServer.pdb and b/ApiServer/bin/Debug/net5.0/ApiServer.pdb differ diff --git a/ApiServer/bin/Debug/net5.0/ApiServer.runtimeconfig.dev.json b/ApiServer/bin/Debug/net5.0/ApiServer.runtimeconfig.dev.json index ea4326b..cb610d9 100644 --- a/ApiServer/bin/Debug/net5.0/ApiServer.runtimeconfig.dev.json +++ b/ApiServer/bin/Debug/net5.0/ApiServer.runtimeconfig.dev.json @@ -1,11 +1,10 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\google\\.nuget\\packages", + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" ] } } \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Colors.json b/ApiServer/bin/Debug/net5.0/Config/Colors.json new file mode 100644 index 0000000..4a09cea --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Colors.json @@ -0,0 +1,3 @@ +{ + "red" : "#ff0000" +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Discret/all.json b/ApiServer/bin/Debug/net5.0/Config/Discret/all.json new file mode 100644 index 0000000..506b7a3 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Discret/all.json @@ -0,0 +1,87 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { + "parent": [ "default" ], + "struct": [ + { + "index": 2, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + } + ] + }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { + "parent": [ "default" ], + "struct": [ + { + "index": 1, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + } + ] + + }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Discret/default.json b/ApiServer/bin/Debug/net5.0/Config/Discret/default.json new file mode 100644 index 0000000..4969fef --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Discret/default.json @@ -0,0 +1,823 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Дискрет №0", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 0 + } + ] + }, + { + "index": 1, + "name": "P1 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + }, + { + "index": 2, + "name": "P2 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + }, + { + "index": 3, + "name": "Вода камеры", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 3 + } + ] + }, + { + "index": 4, + "name": "Вода штока", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 4 + } + ] + }, + { + "index": 5, + "name": "Дверь - А", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 5 + } + ] + }, + { + "index": 6, + "name": "Дверь - Б", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 6 + } + ] + }, + { + "index": 7, + "name": "Дверь - В", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 7 + } + ] + }, + { + "index": 8, + "name": "Дверь - Г", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 0 + } + ] + }, + { + "index": 9, + "name": "Дверь - Д", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 1 + } + ] + }, + { + "index": 10, + "name": "Люк", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 2 + } + ] + }, + { + "index": 11, + "name": "Пенал", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 3 + } + ] + }, + { + "index": 12, + "name": "Упоры", + "state_struct": "out_in_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 4 + } + ] + }, + { + "index": 13, + "name": "Прижимы", + "state_struct": "spinn_clamp_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 5 + } + ] + }, + { + "index": 14, + "name": "Вакуумный выключатель", + "state_struct": "none_on_off_err_3_4", + "bits": [ + { + "byte_index": 47, + "bit_index": 6 + }, + { + "byte_index": 47, + "bit_index": 7 + } + ] + }, + { + "index": 15, + "skip": true + }, + { + "index": 16, + "name": "\"Автоматика\"", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 7 + } + ] + }, + { + "index": 31, + "skip": true + }, + { + "index": 17, + "name": "БПС", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 1 + }, + { + "byte_index": 50, + "bit_index": 0 + } + ] + }, + { + "index": 32, + "skip": true + }, + { + "index": 18, + "name": "Соленоид", + "state_struct": "none_err_const_puls_1_2", + "bits": [ + { + "byte_index": 48, + "bit_index": 2 + }, + { + "byte_index": 48, + "bit_index": 3 + } + ] + }, + { + "index": 19, + "skip": true + }, + { + "index": 20, + "name": "ARPW", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 4 + }, + { + "byte_index": 48, + "bit_index": 7 + } + ] + }, + { + "index": 23, + "skip": true + }, + { + "index": 21, + "name": "ДВН", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 5 + }, + { + "byte_index": 49, + "bit_index": 3 + } + ] + }, + { + "index": 27, + "skip": true + }, + { + "index": 22, + "name": "SZO", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 48, + "bit_index": 6 + } + ] + }, + { + "index": 24, + "name": "ДУ-260", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 1 + } + ] + }, + { + "index": 25, + "skip": true + }, + { + "index": 26, + "name": "ДУ-100", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 2 + }, + { + "byte_index": 50, + "bit_index": 2 + } + ] + }, + { + "index": 34, + "skip": true + }, + { + "index": 28, + "name": "ДУ-32", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 4 + }, + { + "byte_index": 50, + "bit_index": 3 + } + ] + }, + { + "index": 35, + "skip": true + }, + { + "index": 29, + "name": "Шток вверху", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 5 + } + ] + }, + { + "index": 30, + "name": "Шток внизу", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 6 + } + ] + }, + { + "index": 33, + "name": "Плохой вакуум", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 1 + } + ] + }, + { + "index": 36, + "name": "Напряжение аварийной сигнализации", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 50, + "bit_index": 4 + } + ] + }, + { + "index": 37, + "name": "Взрывной клапан", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 5 + } + ] + }, + { + "index": 38, + "name": "Ключ УП в положении \"Автоматика\"", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 6 + } + ] + }, + { + "index": 39, + "name": "off_on_err", + "state_struct": "Реле \"Авария источника\"", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 40, + "name": "Сброс звуковой сигнализации", + "state_struct": "spinn_press", + "bits": [ + { + "byte_index": 51, + "bit_index": 0 + } + ] + }, + { + "index": 41, + "name": "Вакуум по ЭКМВ", + "state_struct": "have_no_err", + "bits": [ + { + "byte_index": 51, + "bit_index": 1 + } + ] + }, + { + "index": 42, + "name": "Реле \"Имитация тока дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 2 + } + ] + }, + { + "index": 43, + "name": "Реле \"АУ током дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 3 + } + ] + }, + { + "index": 44, + "name": "Реле \"Имитация напряжения дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 4 + } + ] + }, + { + "index": 45, + "name": "Реле \"Имитация вакуума печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 5 + } + ] + }, + { + "index": 46, + "name": "Реле \"Имитация T воды кристаллизатора\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 6 + } + ] + }, + { + "index": 47, + "name": "Реле \"Имитация T воды вакуумкамеры\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 7 + } + ] + }, + { + "index": 48, + "name": "Реле \"Имитация T воды штока\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 0 + } + ] + }, + { + "index": 49, + "name": "Реле 1 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 1 + } + ] + }, + { + "index": 50, + "name": "Реле 2 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 2 + } + ] + }, + { + "index": 51, + "name": "Реле 3 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 3 + } + ] + }, + { + "index": 52, + "name": "Реле 4 \"Контроль метрологии\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 4 + } + ] + }, + { + "index": 53, + "name": "Реле 5 \"Измерение изоляции (соленоид)\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 5 + } + ] + }, + { + "index": 54, + "name": "Реле \"АУ штоком\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 6 + } + ] + }, + { + "index": 55, + "name": "Реле \"Включение Uкалибровки\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 7 + } + ] + }, + { + "index": 56, + "name": "Реле \"Движение штока вверх\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 0 + } + ] + }, + { + "index": 57, + "name": "УП в положении КЗ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 1 + } + ] + }, + { + "index": 58, + "name": "Нет питания, включено \"резервное\" UPS", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 2 + } + ] + }, + { + "index": 59, + "name": "Вода подставки", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 3 + } + ] + }, + { + "index": 60, + "name": "Реле \"Разрешение на вакуумирование печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 4 + } + ] + }, + { + "index": 61, + "name": "Низкий заряд аккумулятора UPS", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 5 + } + ] + }, + { + "index": 62, + "name": "КВ рамы", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 6 + } + ] + }, + { + "index": 63, + "name": "Источник: +24В", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 64, + "name": "Реле \"Движение штока вниз\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 0 + } + ] + }, + { + "index": 65, + "name": "Проверка источника", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 1 + } + ] + }, + { + "index": 66, + "name": "Станция", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + }, + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 67, + "skip": true + }, + { + "index": 68, + "name": "Постоянное U=220В", + "state_struct": "no_have", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": "Источник готов", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 70, + "name": "Авария привода", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 6 + } + ] + }, + { + "index": 71, + "name": "Реле \"Напуск газа в печь\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 7 + } + ] + }, + { + "index": 74, + "name": "Реле \"АУ током дуги ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 76, + "name": "Готовность привода", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 4 + } + ] + }, + { + "index": 78, + "name": "Реле \"Авария источника ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 6 + } + ] + }, + { + "index": 79, + "name": "Клапан подачи аргона", + "state_struct": "close_open_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 7 + } + ] + }, + { + "index": 95, + "name": "Разрешение на вкл. вакуумного выключателя", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 57, + "bit_index": 7 + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Discret/power_new.json b/ApiServer/bin/Debug/net5.0/Config/Discret/power_new.json new file mode 100644 index 0000000..5fd7d88 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Discret/power_new.json @@ -0,0 +1,127 @@ +{ + "power_new": { + "struct": [ + { + "index": 39, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 63, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 66, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + } + ] + }, + { + "index": 67, + "name": ". ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 68, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": " ", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 72, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 0 + } + ] + }, + { + "index": 73, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 1 + } + ] + }, + { + "index": 74, + "name": " ", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 75, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 3 + } + ] + }, + { + "index": 77, + "name": " ", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 5 + } + ] + } + ] + } +} diff --git a/ApiServer/bin/Debug/net5.0/Config/Metrics.json b/ApiServer/bin/Debug/net5.0/Config/Metrics.json new file mode 100644 index 0000000..e0b5f48 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Metrics.json @@ -0,0 +1,13 @@ +{ + "кА": false, + "В": false, + "А": false, + "гр.С": false, + "мм": false, + "мкм.рт.ст": true, + "м^3/ч": false, + "кгс/см^2": false, + "мм.рт.ст": true, + "МВт": false, + "Гц": true +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Protect/all.json b/ApiServer/bin/Debug/net5.0/Config/Protect/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Protect/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/Protect/default.json b/ApiServer/bin/Debug/net5.0/Config/Protect/default.json new file mode 100644 index 0000000..8bea6f7 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/Protect/default.json @@ -0,0 +1,356 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Alarm ! Zero signal !", + "state_struct": "protect_1" + }, + { + "index":1, + "name": "Шток внизу !", + "state_struct": "protect_1" + }, + { + "index":2, + "name": "Шток вверху !", + "state_struct": "protect_1" + }, + { + "index": 3, + "name": "Uдуги > Uмакс !", + "state_struct": "protect_1" + }, + { + "index": 4, + "name": "Uдуги < Uмин !", + "state_struct": "protect_1" + }, + { + "index": 5, + "name": "Qводы кристаллизатора !", + "state_struct": "protect_1" + }, + { + "index": 6, + "name": "P2 воды кристаллизатора ЭКМ отметка -5м !", + "state_struct": "protect_1" + }, + { + "index": 7, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 8, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 9, + "name": "Вода штока !", + "state_struct": "protect_1" + }, + { + "index":10, + "name": "tводы штока !", + "state_struct": "protect_1" + }, + { + "index":11, + "name": "Вода вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":12, + "name": "tводы вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":13, + "name": "Ухудшение вакуума !", + "state_struct": "protect_1" + }, + { + "index": 14, + "name": "Нет готовности к токовой операции!", + "state_struct": "protect_1" + }, + { + "index": 15, + "name": "Дверь А открыта !", + "state_struct": "protect_1" + }, + { + "index": 16, + "name": "Дверь Б открыта !", + "state_struct": "protect_1" + }, + { + "index": 17, + "name": "Дверь В открыта !", + "state_struct": "protect_1" + }, + { + "index": 18, + "name": "Дверь Г открыта !", + "state_struct": "protect_1" + }, + { + "index": 19, + "name": "Дверь Д открыта !", + "state_struct": "protect_1" + }, + { + "index": 20, + "name": "Прижимы !", + "state_struct": "protect_1" + }, + { + "index": 21, + "name": "Упоры !", + "state_struct": "protect_1" + }, + { + "index": 22, + "name": "Люк открыт !", + "state_struct": "protect_1" + }, + { + "index": 23, + "name": "Пенал открыт !", + "state_struct": "protect_1" + }, + { + "index": 24, + "name": "Вода подставки !", + "state_struct": "protect_1" + }, + { + "index": 25, + "name": "Нет U аварийной сигнализации !", + "state_struct": "protect_1" + }, + { + "index": 26, + "name": "Плохой вакуум !", + "state_struct": "protect_1" + }, + { + "index": 27, + "name": "tводы подставки !", + "state_struct": "protect_1" + }, + { + "index": 28, + "name": "Давление газа в печи выше атмосферного !", + "state_struct": "protect_1" + }, + { + "index": 29, + "name": "Вода фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 30, + "name": "Отключение ВВ!", + "state_struct": "protect_1" + }, + { + "index": 31, + "name": "tводы фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 32, + "name": "P воды поддона !", + "state_struct": "protect_1" + }, + { + "index": 33, + "name": "Отсутствует связь с сервером 1 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 34, + "name": "Отсутствует связь с сервером 2 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 35, + "name": "Отсутствует связь с контроллером ГМП !", + "state_struct": "protect_1" + }, + { + "index": 36, + "name": "Неисправность в работе ARPW !", + "state_struct": "protect_1" + }, + { + "index": 37, + "name": "Неисправность в работе ДВН !", + "state_struct": "protect_1" + }, + { + "index": 38, + "name": "Неисправность в работе ВВ !", + "state_struct": "protect_1" + }, + { + "index": 39, + "name": "Неисправность в работе ДУ-260 !", + "state_struct": "protect_1" + }, + { + "index": 40, + "name": "Неисправность в работе ДУ-100 !", + "state_struct": "protect_1" + }, + { + "index": 41, + "name": "Неисправность в работе ДУ-32 !", + "state_struct": "protect_1" + }, + { + "index": 43, + "name": "Неисправность в работе БПС !", + "state_struct": "protect_1" + }, + { + "index": 44, + "name": "Неисправность в режиме работы соленоида !", + "state_struct": "protect_1" + }, + { + "index": 45, + "name": "Нет питания сети !", + "state_struct": "protect_1" + }, + { + "index": 46, + "name": "КВ рамы", + "state_struct": "protect_1" + }, + { + "index": 48, + "name": "Нет сигнала датчика (МЕТРАН отм.+1.5м) !", + "state_struct": "protect_1" + }, + { + "index": 49, + "name": "БПС ГМП отключен!", + "state_struct": "protect_1" + }, + { + "index": 50, + "name": "Неисправность источника питания ВДП !", + "state_struct": "protect_1" + }, + { + "index": 51, + "name": "Нет принимаемых данных !", + "state_struct": "protect_1" + }, + { + "index": 52, + "name": "Разрыв дуги !", + "state_struct": "protect_1" + }, + { + "index": 53, + "name": "Нет готовности привода!", + "state_struct": "protect_1" + }, + { + "index": 54, + "name": "Alarm ! Signal A1_22 is set.", + "state_struct": "protect_1" + }, + { + "index": 55, + "name": "Короткое замыкание !", + "state_struct": "protect_1" + }, + { + "index": 56, + "name": "Переключатель УП не в положении АВТ !", + "state_struct": "protect_1" + }, + { + "index": 57, + "name": "Проверить перевод разьединителей печей!", + "state_struct": "protect_1" + }, + { + "index": 58, + "name": "Снижение протока воды штока!", + "state_struct": "protect_1" + }, + { + "index": 59, + "name": "Снижение протока воды камеры!", + "state_struct": "protect_1" + }, + { + "index": 60, + "name": "Снижение протока воды фланца!", + "state_struct": "protect_1" + }, + { + "index": 61, + "name": "Запрет зажигания дуги по времени вакуумирования!", + "state_struct": "protect_1" + }, + { + "index": 62, + "name": "Отсутствует ток соленоида !", + "state_struct": "protect_1" + }, + { + "index": 63, + "name": "Отсутствует перемещение штока !", + "state_struct": "protect_1" + }, + { + "index": 64, + "name": "Отсутствует перемещение штока > 15 минут!", + "state_struct": "protect_1" + }, + { + "index": 65, + "name": "Запрет на включение вакуумных насосов !", + "state_struct": "protect_1" + }, + { + "index": 67, + "name": "ВДП развакуумирована !", + "state_struct": "protect_1" + }, + { + "index": 70, + "name": "Смещение начала архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 71, + "name": "Смещение конца архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 74, + "name": "", + "state_struct": "protect_1" + }, + { + "index": 75, + "name": "Alarm ! Signal A1_43 is set.", + "state_struct": "protect_1" + }, + { + "index": 76, + "name": "Alarm ! Signal A1_44 is set.", + "state_struct": "protect_1" + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/StateStruct.json b/ApiServer/bin/Debug/net5.0/Config/StateStruct.json new file mode 100644 index 0000000..557fa01 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/StateStruct.json @@ -0,0 +1,265 @@ +{ + "protect_1": [ + { + "index": 0, + "name": "Отсутствует", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Сработало", + "color": "#ffff00" + }, + { + "index": 2, + "name": "Сброс тока", + "color": "#ff0000" + } + ], + "no_yes_err": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#ff0000" + } + ], + "no_yes_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "no_yes": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "have_no_err": [ + { + "index": 0, + "name": "Есть", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Нет", + "color": "#ff0000" + } + ], + "no_have_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "no_have": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "off_on_err": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#ff0000" + } + ], + "off_on": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + } + ], + "open_close_ok": [ + { + "index": 0, + "name": "Откр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Закр", + "color": "#00ff00" + } + ], + "close_open_ok": [ + { + "index": 0, + "name": "Закр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + } + ], + + "out_in_ok": [ + { + "index": 0, + "name": "Не введ", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Введ", + "color": "#00ff00" + } + ], + "spinn_clamp_ok": [ + { + "index": 0, + "name": "Отж", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Приж", + "color": "#00ff00" + } + ], + "spinn_press": [ + { + "index": 0, + "name": "Отж", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Наж", + "color": "#00ff00" + } + ], + "none_on_off_err_3_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#ff0000" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_on_off_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_err_const_puls_1_2": [ + { + "index": 0, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 2, + "name": "Пост", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Пульс", + "color": "#00ff00" + } + ], + "none_open_close_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Закр", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ] + +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/TechCycle.json b/ApiServer/bin/Debug/net5.0/Config/TechCycle.json new file mode 100644 index 0000000..715756d --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/TechCycle.json @@ -0,0 +1,94 @@ +{ + "tech_cycle_conf": [ + { + "index": -1, + "name": "Конец технологического цикла (ручной)", + "color": "#00ffff" + }, + { + "index": 0, + "name": "Конец технологического цикла", + "color": "#00ffff" + }, + { + "index": 1, + "name": "Выгрузка-загрузка", + "color": "#00ffff" + }, + { + "index": 2, + "name": "Вакуумирование на приварку", + "color": "#0000ff" + }, + { + "index": 5, + "name": "Приварка", + "color": "#ff0000" + }, + { + "index": 6, + "name": "Охлаждение приварки", + "color": "#00ff00" + }, + { + "index": 7, + "name": "Осмотр приварки", + "color": "#00ffff" + }, + { + "index": 8, + "name": "Вакуумирование на плавку", + "color": "#0000ff" + }, + { + "index": 9, + "name": "Разведение ванны", + "color": "#8500b6" + }, + { + "index": 10, + "name": "Плавка (основной режим)", + "color": "#ff0000" + }, + { + "index": 11, + "name": "ВУР", + "color": "#ff00ff" + }, + { + "index": 12, + "name": "Охлаждение слитка", + "color": "#00ff00" + }, + { + "index": 13, + "name": "Выгрузка комплекта", + "color": "#00ffff" + }, + { + "index": 14, + "name": "Вакуумирование на оплавление", + "color": "#0000ff" + }, + { + "index": 15, + "name": "Оплавление", + "color": "#ff0000" + }, + { + "index": 16, + "name": "Охлаждение оплавыша", + "color": "#00ff00" + }, + { + "index": 17, + "name": "Слив металла", + "color": "#8500b6" + }, + { + "index": 25, + "name": "Проверка защит", + "color": "#00ffff" + } + ] +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/analog/all.json b/ApiServer/bin/Debug/net5.0/Config/analog/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/analog/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/analog/default.json b/ApiServer/bin/Debug/net5.0/Config/analog/default.json index d096f0e..0fbd4bc 100644 --- a/ApiServer/bin/Debug/net5.0/Config/analog/default.json +++ b/ApiServer/bin/Debug/net5.0/Config/analog/default.json @@ -1,368 +1,380 @@ { - "deleteAll": true, - "delete": [], - "add": [ - { - "id": 0, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [ 0, 1 ] - }, - { - "id": 1, - "name": " ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [ 2, 3 ] - }, - { - "id": 2, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [4,5] - }, - { - "id": 3, - "name": "U ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [6,7] - }, - { - "id": 4, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [8,9] - }, - { - "id": 5, - "name": "U ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [10,11] - }, - { - "id": 6, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [12,13] - }, - { - "id": 7, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [14,15] - }, - { - "id": 8, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [16,17] - }, - { - "id": 9, - "name": "t -", - "sname": "t -", - "measure": ".", - "byteId": [18,19] - }, - { - "id": 10, - "name": "t ", - "sname": "t ", - "measure": ".", - "byteId": [20,21] - }, - { - "id": 11, - "name": " 0.1", - "sname": "S ", - "measure": "", - "mul": 0.1, - "byteId": [22,23] - }, - { - "id": 12, - "name": "", - "sname": "S ", - "measure": "", - "byteId": [24,25] - }, - { - "id": 13, - "name": " ", - "measure": "..", - "mul": -1, - "byteId": [26,27] - }, - { - "id": 14, - "name": " -", - "sname": "R -", - "measure": "", - "mul": 0.1, - "byteId": [28,29] - }, - { - "id": 15, - "name": " -", - "sname": "R -", - "measure": "", - "mul": 0.1, - "byteId": [30,31] - }, - { - "id": 16, - "name": " ", - "sname": "Q .", - "measure": "^3/", - "byteId": [ 32, 33 ] - }, - { - "id": 17, - "name": " ", - "sname": "..", - "mul": 0.01, - "byteId": [34,35] - }, - { - "id": 18, - "name": " ", - "sname": "..", - "mul": 0.1, - "byteId": [36,37] - }, - { - "id": 19, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [38,39] - }, - { - "id": 20, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [40,41] - }, - { - "id": 21, - "name": " .+1,5", - "sname": "P .", - "measure": "/^2", - "mul": 0.01, - "byteId": [42,43] - }, - { - "id": 22, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [44,45] - }, - { - "id": 23, - "name": " ()", - "sname": "I . ", - "measure": "", - "mul": 0.1, - "byteId": [58,59] - }, - { - "id": 25, - "name": "-. ", - "sname": "-", - "measure": "", - "mul": 0.1, - "byteId": [62,63] - }, - { - "id": 26, - "name": "-. . ", - "sname": "-", - "measure": "", - "mul": 0.1, - "byteId": [64,65] - }, - { - "id": 27, - "name": "t -", - "sname": "t .", - "measure": ".", - "byteId": [66,67] - }, - { - "id": 28, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [68,69] - }, - { - "id": 29, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [70,71] - }, - { - "id": 30, - "name": " ", - "sname": ". .", - "measure": "", - "mul": 0.1, - "byteId": [72,73] - }, - { - "id": 31, - "name": " (.)", - "sname": "I .. .", - "measure": "", - "mul": 0.1, - "byteId": [74,75] - }, - { - "id": 33, - "name": " -1200", - "sname": "-1200", - "measure": "..", - "mul": 0.1, - "byteId": [78,79] - }, - { - "id": 34, - "name": " -18,75", - "sname": "-18,25", - "measure": "..", - "mul": 0.001, - "byteId": [80,81] - }, - { - "id": 35, - "name": " ", - "sname": "P ..", - "measure": "/^2", - "mul": 0.1, - "byteId": [82,83] - }, - { - "id": 36, - "name": " ", - "sname": "P ..", - "measure": "/^2", - "byteId": [84,85] - }, - { - "id": 37, - "name": " ()", - "sname": ".I, ", - "measure": "", - "mul": 0.1, - "byteId": [86,87] - }, - { - "id": 38, - "name": " ", - "sname": "...", - "measure": "", - "mul": 0.01, - "byteId": [88,89] - }, - { - "id": 39, - "name": " ARPW", - "sname": "I . ARPW", - "measure": "", - "mul": 0.01, - "byteId": [90,91] - }, - { - "id": 40, - "name": " ", - "sname": "., ", - "measure": "", - "mul": 0.1, - "byteId": [] - }, - { - "id": 41, - "name": " . 1 .", - "sname": "U . 1, ", - "measure": "", - "mul": 0.1, - "byteId": [92,93] - }, - { - "id": 42, - "name": ": 1", - "sname": "I 1 ", - "measure": "", - "byteId": [94,95] - }, - { - "id": 43, - "name": ": 2", - "sname": "I 2 ", - "measure": "", - "byteId": [96,97] - }, - { - "id": 44, - "name": ": 3", - "sname": "I 3 ", - "measure": "", - "byteId": [98,99] - }, - { - "id": 45, - "name": ": ", - "sname": ". ", - "measure": "", - "mul": 0.1, - "byteId": [100,101] - }, - { - "id": 46, - "name": ": p", - "mul": 0.01, - "byteId": [102,103] - }, - { - "id": 47, - "name": ": i", - "mul": 0.01, - "byteId": [104,105] - }, - { - "id": 49, - "name": " ", - "byteId": [106,107] - }, - { - "id": 50, - "name": " U ", - "measure": "", - "mul": 0.1, - "byteId": [108,109] - } - - ] -} + "default": { + "struct": [ + { + "index": 0, + "name": "Ток дуги", + "s_name": "I д", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 0, 1 ] + }, + { + "index": 1, + "name": "Напряжение дуги", + "s_name": "U д", + "metric": "В", + "mul": 0.1, + "show_default": true, + "bytes": [ 2, 3 ] + }, + { + "index": 2, + "name": "Ток рабочего двигателя", + "s_name": "I рд", + "metric": "А", + "mul": 0.1, + "bytes": [ 4, 5 ] + }, + { + "index": 3, + "name": "U рабочего двигателя", + "s_name": "U рд", + "metric": "В", + "mul": 0.1, + "bytes": [ 6, 7 ] + }, + { + "index": 4, + "name": "Ток соленоида", + "s_name": "I сол", + "metric": "А", + "mul": 0.1, + "bytes": [ 8, 9 ] + }, + { + "index": 5, + "name": "U соленоида", + "s_name": "U сол", + "metric": "В", + "mul": 0.1, + "bytes": [ 10, 11 ] + }, + { + "index": 6, + "name": "Ток задания", + "s_name": "I рз", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 12, 13 ] + }, + { + "index": 7, + "name": "t кристаллизатора на входе", + "s_name": "t кр.вых", + "metric": "гр.С", + "mul": 1, + "bytes": [ 14, 15 ] + }, + { + "index": 8, + "name": "t кристаллизатора на выходе", + "s_name": "t кр.вх", + "metric": "гр.С", + "mul": 1, + "bytes": [ 16, 17 ] + }, + { + "index": 9, + "name": "t вакуум-камеры", + "s_name": "t вак-кам", + "metric": "гр.С", + "mul": 1, + "bytes": [ 18, 19 ] + }, + { + "index": 10, + "name": "t штока", + "s_name": "t шт", + "metric": "гр.С", + "mul": 1, + "bytes": [ 20, 21 ] + }, + { + "index": 11, + "name": "U контроля", + "s_name": "U конт", + "metric": "В", + "mul": 0.1, + "bytes": [ 22, 23 ] + }, + { + "index": 12, + "name": "Перемещение", + "s_name": "S шт", + "metric": "мм", + "mul": 1, + "bytes": [ 24, 25 ] + }, + { + "index": 13, + "name": "Вакуум", + "s_name": "Вакуум", + "metric": "мкм.рт.ст", + "mul": -1, + "show_default": true, + "bytes": [ 26, 27 ] + }, + { + "index": 14, + "name": "Изоляция шток-крышка", + "s_name": "R шт-кр", + "metric": "В", + "mul": 0.1, + "bytes": [ 28, 29 ] + }, + { + "index": 15, + "name": "Изоляция крышка-камера", + "s_name": "R кр-кам", + "metric": "В", + "mul": 0.1, + "bytes": [ 30, 31 ] + }, + { + "index": 16, + "name": "Расход воды", + "s_name": "Q в.кр", + "metric": "м^3/ч", + "mul": 1, + "bytes": [ 32, 33 ] + }, + { + "index": 17, + "name": "Капельные замыкания", + "s_name": "Кап.зам.", + "metric": "УЕ", + "mul": 0.01, + "bytes": [ 34, 35 ] + }, + { + "index": 18, + "name": "Усреднённая ширина импульсов КЗ", + "s_name": "Кап.зым.", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 36, 37 ] + }, + { + "index": 19, + "name": "Проток воды фланца", + "s_name": "Qв. фл.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 38, 39 ] + }, + { + "index": 20, + "name": "Проток воды штока", + "s_name": "Qв. шт.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 40, 41 ] + }, + { + "index": 21, + "name": "Давление воды крист.+1,5", + "s_name": "P в.кр", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [ 42, 43 ] + }, + { + "index": 22, + "name": "Проток воды камеры", + "s_name": "Qв. кам.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 44, 45 ] + }, + { + "index": 23, + "name": "Ток задания источника(САУ)", + "s_name": "I з.ист САУ", + "metric": "кА", + "mul": 0.1, + "bytes": [ 58, 59 ] + }, + { + "index": 24, + "name": "", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 60, 61 ] + }, + { + "index": 25, + "name": "ПИД-рег. основная уставка", + "s_name": "ПИД-осн", + "metric": "В", + "mul": 0.1, + "bytes": [ 62, 63 ] + }, + { + "index": 26, + "name": "ПИД-рег. макс. скорость", + "s_name": "ПИД-макс", + "metric": "В", + "mul": 0.1, + "bytes": [ 64, 65 ] + }, + { + "index": 27, + "name": "t фланца вакуум-камеры", + "s_name": "t фл.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 66, 67 ] + }, + { + "index": 28, + "name": "t подставки", + "s_name": "t под.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 68, 69 ] + }, + { + "index": 29, + "name": "Проток воды подставки", + "s_name": "Qв. под.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 70, 71 ] + }, + { + "index": 30, + "name": "Задание соленоида", + "s_name": "Зад. сол.", + "metric": "А", + "mul": 0.1, + "bytes": [ 72, 73 ] + }, + { + "index": 31, + "name": "Ток задания источника(преобраз.)", + "s_name": "I з.ист. преоб.", + "metric": "кА", + "mul": 0.1, + "bytes": [ 74, 75 ] + }, + { + "index": 32, + "name": "Резерв", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 76, 77 ] + }, + { + "index": 33, + "name": "Вакуум по МЕТРАН-1200", + "s_name": "МЕТРАН-1200", + "metric": "мм.рт.ст", + "mul": 0.1, + "show_default": true, + "bytes": [ 78, 79 ] + }, + { + "index": 34, + "name": "Вакуум по МЕТРАН-18,75", + "s_name": "МЕТРАН-18,25", + "metric": "мм.рт.ст", + "mul": 0.001, + "show_default": true, + "bytes": [ 80, 81 ] + }, + { + "index": 35, + "name": "Давление газа в баллоне", + "s_name": "P г.балл.", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [ 82, 83 ] + }, + { + "index": 36, + "name": "Давление воды поддона", + "s_name": "P в.подд.", + "metric": "кгс/см^2", + "mul": 1, + "bytes": [ 84, 85 ] + }, + { + "index": 37, + "name": "Задание тока дуги (ЦАП)", + "s_name": "Зад.I, ЦАП", + "metric": "кА", + "mul": 0.1, + "bytes": [ 86, 87 ] + }, + { + "index": 38, + "name": "Задкние скорости рабочего двигателя", + "s_name": "Зад.ск.раб.дв", + "metric": "В", + "mul": 0.1, + "bytes": [ 88, 89 ] + }, + { + "index": 39, + "name": "Ток двигателя насоса ARPW", + "s_name": "I дв. ARPW", + "metric": "А", + "mul": 0.01, + "bytes": [ 90, 91 ] + }, + { + "index": 40, + "name": "Энергия плавильного пролёта", + "s_name": "Эн.пролёта, МВт", + "metric": "МВт", + "mul": 0.1, + "bytes": [ 92, 93 ] + }, + { + "index": 41, + "name": "Среднее напряжение плавления", + "s_name": "U средн, В", + "metric": "В", + "mul": 0.1, + "bytes": [ 94, 95 ] + }, + { + "index": 42, + "name": "ГМП: ток катушки 1", + "s_name": "I кат1 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 96, 97 ] + }, + { + "index": 43, + "name": "ГМП: ток катушки 2", + "s_name": "I кат2 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 98, 99 ] + }, + { + "index": 44, + "name": "ГМП: ток катушки 3", + "s_name": "I кат3 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 100, 101 ] + }, + { + "index": 45, + "name": "ГМП: частота", + "s_name": "Част. ГМП", + "metric": "Гц", + "mul": 1, + "bytes": [ 102, 103 ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/analog/global.json b/ApiServer/bin/Debug/net5.0/Config/analog/global.json new file mode 100644 index 0000000..f65ef99 --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/analog/global.json @@ -0,0 +1,110 @@ +{ + "00": { + "struct": [ + { + "index": 0, + "name": "Общий: t воды водооборота", + "s_name": "t в", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 1, + "name": "Общий: Давление воды водооборота", + "s_name": "P в", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [] + }, + { + "index": 2, + "name": "Общий: Давление масла в бутыли", + "s_name": "P масла бут", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 3, + "name": "Общий: t воздуха в машинном зале", + "s_name": "t машзал", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 4, + "name": "Общий: t воздуха на улице", + "s_name": "t улица", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 5, + "name": "Общий: Атмосферное давление", + "s_name": "p атм", + "metric": "мм.рт.ст", + "mul": 0.1, + "bytes": [] + }, + { + "index": 6, + "name": "Общий: Давление масла в магистрали", + "s_name": "P масла маг", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 7, + "name": "Общий: Давление воды водооборота-К90", + "s_name": "P в-90", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 8, + "name": "Скорость штока за 1 мин", + "s_name": "V шт", + "metric": "мм/мин", + "mul": 0.01, + "bytes": [] + }, + { + "index": 9, + "name": "Вакуум по МЕТРАН 1,2", + "s_name": "МЕТРАН1,2", + "metric": "мм.рт.ст", + "mul": 0.001, + "bytes": [] + }, + { + "index": 10, + "name": "ВС: Ток дуги", + "s_name": "ВС:I д", + "metric": "кА", + "mul": 0.1, + "bytes": [] + }, + { + "index": 12, + "name": "ВС: Напряжение дуги", + "s_name": "ВС:U д", + "metric": "В", + "mul": 0.1, + "bytes": [] + }, + { + "index": 13, + "name": "ВС: Ток задания", + "s_name": "ВС:I рз", + "metric": "кА", + "mul": 0.1, + "bytes": [] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/Config/bufer.json b/ApiServer/bin/Debug/net5.0/Config/bufer.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/ApiServer/bin/Debug/net5.0/Config/bufer.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/ApiServer/bin/Debug/net5.0/DataClient.dll b/ApiServer/bin/Debug/net5.0/DataClient.dll index 3716908..0e0e63a 100644 Binary files a/ApiServer/bin/Debug/net5.0/DataClient.dll and b/ApiServer/bin/Debug/net5.0/DataClient.dll differ diff --git a/ApiServer/bin/Debug/net5.0/DataClient.pdb b/ApiServer/bin/Debug/net5.0/DataClient.pdb index 2b4f6f7..a737324 100644 Binary files a/ApiServer/bin/Debug/net5.0/DataClient.pdb and b/ApiServer/bin/Debug/net5.0/DataClient.pdb differ diff --git a/ApiServer/bin/Debug/net5.0/ICSharpCode.SharpZipLib.dll b/ApiServer/bin/Debug/net5.0/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..8a74343 Binary files /dev/null and b/ApiServer/bin/Debug/net5.0/ICSharpCode.SharpZipLib.dll differ diff --git a/ApiServer/bin/Debug/net5.0/ref/ApiServer.dll b/ApiServer/bin/Debug/net5.0/ref/ApiServer.dll index 34fd394..9c7df0d 100644 Binary files a/ApiServer/bin/Debug/net5.0/ref/ApiServer.dll and b/ApiServer/bin/Debug/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/bin/Release/ApiServer.deps.json b/ApiServer/bin/Release/ApiServer.deps.json deleted file mode 100644 index 0e5ca18..0000000 --- a/ApiServer/bin/Release/ApiServer.deps.json +++ /dev/null @@ -1,3605 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v5.0", - "signature": "" - }, - "compilationOptions": { - "defines": [ - "TRACE", - "RELEASE", - "NET", - "NET5_0", - "NETCOREAPP", - "NET5_0_OR_GREATER", - "NETCOREAPP1_0_OR_GREATER", - "NETCOREAPP1_1_OR_GREATER", - "NETCOREAPP2_0_OR_GREATER", - "NETCOREAPP2_1_OR_GREATER", - "NETCOREAPP2_2_OR_GREATER", - "NETCOREAPP3_0_OR_GREATER", - "NETCOREAPP3_1_OR_GREATER" - ], - "languageVersion": "9.0", - "platform": "", - "allowUnsafe": false, - "warningsAsErrors": false, - "optimize": true, - "keyFile": "", - "emitEntryPoint": true, - "xmlDoc": false, - "debugType": "portable" - }, - "targets": { - ".NETCoreApp,Version=v5.0": { - "ApiServer/1.0.0": { - "dependencies": { - "DataClient": "0.0.3", - "NLog": "4.7.10", - "Newtonsoft.Json": "13.0.1", - "Microsoft.AspNetCore.Antiforgery": "5.0.0.0", - "Microsoft.AspNetCore.Authentication.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Authentication.Cookies": "5.0.0.0", - "Microsoft.AspNetCore.Authentication.Core": "5.0.0.0", - "Microsoft.AspNetCore.Authentication": "5.0.0.0", - "Microsoft.AspNetCore.Authentication.OAuth": "5.0.0.0", - "Microsoft.AspNetCore.Authorization": "5.0.0.0", - "Microsoft.AspNetCore.Authorization.Policy": "5.0.0.0", - "Microsoft.AspNetCore.Components.Authorization": "5.0.0.0", - "Microsoft.AspNetCore.Components": "5.0.0.0", - "Microsoft.AspNetCore.Components.Forms": "5.0.0.0", - "Microsoft.AspNetCore.Components.Server": "5.0.0.0", - "Microsoft.AspNetCore.Components.Web": "5.0.0.0", - "Microsoft.AspNetCore.Connections.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.CookiePolicy": "5.0.0.0", - "Microsoft.AspNetCore.Cors": "5.0.0.0", - "Microsoft.AspNetCore.Cryptography.Internal": "5.0.0.0", - "Microsoft.AspNetCore.Cryptography.KeyDerivation": "5.0.0.0", - "Microsoft.AspNetCore.DataProtection.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.DataProtection": "5.0.0.0", - "Microsoft.AspNetCore.DataProtection.Extensions": "5.0.0.0", - "Microsoft.AspNetCore.Diagnostics.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Diagnostics": "5.0.0.0", - "Microsoft.AspNetCore.Diagnostics.HealthChecks": "5.0.0.0", - "Microsoft.AspNetCore": "5.0.0.0", - "Microsoft.AspNetCore.HostFiltering": "5.0.0.0", - "Microsoft.AspNetCore.Hosting.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Hosting": "5.0.0.0", - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Html.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Http.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Http.Connections.Common": "5.0.0.0", - "Microsoft.AspNetCore.Http.Connections": "5.0.0.0", - "Microsoft.AspNetCore.Http": "5.0.0.0", - "Microsoft.AspNetCore.Http.Extensions": "5.0.0.0", - "Microsoft.AspNetCore.Http.Features": "5.0.0.0", - "Microsoft.AspNetCore.HttpOverrides": "5.0.0.0", - "Microsoft.AspNetCore.HttpsPolicy": "5.0.0.0", - "Microsoft.AspNetCore.Identity": "5.0.0.0", - "Microsoft.AspNetCore.Localization": "5.0.0.0", - "Microsoft.AspNetCore.Localization.Routing": "5.0.0.0", - "Microsoft.AspNetCore.Metadata": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.ApiExplorer": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Core": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Cors": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "5.0.0.0", - "Microsoft.AspNetCore.Mvc": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Formatters.Json": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Localization": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.Razor": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.RazorPages": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "5.0.0.0", - "Microsoft.AspNetCore.Mvc.ViewFeatures": "5.0.0.0", - "Microsoft.AspNetCore.Razor": "5.0.0.0", - "Microsoft.AspNetCore.Razor.Runtime": "5.0.0.0", - "Microsoft.AspNetCore.ResponseCaching.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.ResponseCaching": "5.0.0.0", - "Microsoft.AspNetCore.ResponseCompression": "5.0.0.0", - "Microsoft.AspNetCore.Rewrite": "5.0.0.0", - "Microsoft.AspNetCore.Routing.Abstractions": "5.0.0.0", - "Microsoft.AspNetCore.Routing": "5.0.0.0", - "Microsoft.AspNetCore.Server.HttpSys": "5.0.0.0", - "Microsoft.AspNetCore.Server.IIS": "5.0.0.0", - "Microsoft.AspNetCore.Server.IISIntegration": "5.0.0.0", - "Microsoft.AspNetCore.Server.Kestrel.Core": "5.0.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "5.0.0.0", - "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets": "5.0.0.0", - "Microsoft.AspNetCore.Session": "5.0.0.0", - "Microsoft.AspNetCore.SignalR.Common": "5.0.0.0", - "Microsoft.AspNetCore.SignalR.Core": "5.0.0.0", - "Microsoft.AspNetCore.SignalR": "5.0.0.0", - "Microsoft.AspNetCore.SignalR.Protocols.Json": "5.0.0.0", - "Microsoft.AspNetCore.StaticFiles": "5.0.0.0", - "Microsoft.AspNetCore.WebSockets": "5.0.0.0", - "Microsoft.AspNetCore.WebUtilities": "5.0.0.0", - "Microsoft.CSharp": "5.0.0.0", - "Microsoft.Extensions.Caching.Abstractions": "5.0.0.0", - "Microsoft.Extensions.Caching.Memory": "5.0.0.0", - "Microsoft.Extensions.Configuration.Abstractions.Reference": "5.0.0.0", - "Microsoft.Extensions.Configuration.Binder": "5.0.0.0", - "Microsoft.Extensions.Configuration.CommandLine": "5.0.0.0", - "Microsoft.Extensions.Configuration": "5.0.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "5.0.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "5.0.0.0", - "Microsoft.Extensions.Configuration.Ini": "5.0.0.0", - "Microsoft.Extensions.Configuration.Json": "5.0.0.0", - "Microsoft.Extensions.Configuration.KeyPerFile": "5.0.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "5.0.0.0", - "Microsoft.Extensions.Configuration.Xml": "5.0.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions.Reference": "5.0.0.0", - "Microsoft.Extensions.DependencyInjection.Reference": "5.0.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "5.0.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks": "5.0.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "5.0.0.0", - "Microsoft.Extensions.FileProviders.Composite": "5.0.0.0", - "Microsoft.Extensions.FileProviders.Embedded": "5.0.0.0", - "Microsoft.Extensions.FileProviders.Physical": "5.0.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "5.0.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "5.0.0.0", - "Microsoft.Extensions.Hosting": "5.0.0.0", - "Microsoft.Extensions.Http": "5.0.0.0", - "Microsoft.Extensions.Identity.Core": "5.0.0.0", - "Microsoft.Extensions.Identity.Stores": "5.0.0.0", - "Microsoft.Extensions.Localization.Abstractions": "5.0.0.0", - "Microsoft.Extensions.Localization": "5.0.0.0", - "Microsoft.Extensions.Logging.Abstractions.Reference": "5.0.0.0", - "Microsoft.Extensions.Logging.Configuration": "5.0.0.0", - "Microsoft.Extensions.Logging.Console": "5.0.0.0", - "Microsoft.Extensions.Logging.Debug": "5.0.0.0", - "Microsoft.Extensions.Logging.Reference": "5.0.0.0", - "Microsoft.Extensions.Logging.EventLog": "5.0.0.0", - "Microsoft.Extensions.Logging.EventSource": "5.0.0.0", - "Microsoft.Extensions.Logging.TraceSource": "5.0.0.0", - "Microsoft.Extensions.ObjectPool": "5.0.0.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "5.0.0.0", - "Microsoft.Extensions.Options.DataAnnotations": "5.0.0.0", - "Microsoft.Extensions.Options.Reference": "5.0.0.0", - "Microsoft.Extensions.Primitives.Reference": "5.0.0.0", - "Microsoft.Extensions.WebEncoders": "5.0.0.0", - "Microsoft.JSInterop": "5.0.0.0", - "Microsoft.Net.Http.Headers": "5.0.0.0", - "Microsoft.VisualBasic.Core": "10.0.6.0", - "Microsoft.VisualBasic": "10.0.0.0", - "Microsoft.Win32.Primitives": "5.0.0.0", - "Microsoft.Win32.Registry": "5.0.0.0", - "mscorlib": "4.0.0.0", - "netstandard": "2.1.0.0", - "System.AppContext": "5.0.0.0", - "System.Buffers": "5.0.0.0", - "System.Collections.Concurrent": "5.0.0.0", - "System.Collections": "5.0.0.0", - "System.Collections.Immutable": "5.0.0.0", - "System.Collections.NonGeneric": "5.0.0.0", - "System.Collections.Specialized": "5.0.0.0", - "System.ComponentModel.Annotations": "5.0.0.0", - "System.ComponentModel.DataAnnotations": "4.0.0.0", - "System.ComponentModel": "5.0.0.0", - "System.ComponentModel.EventBasedAsync": "5.0.0.0", - "System.ComponentModel.Primitives": "5.0.0.0", - "System.ComponentModel.TypeConverter": "5.0.0.0", - "System.Configuration": "4.0.0.0", - "System.Console": "5.0.0.0", - "System.Core": "4.0.0.0", - "System.Data.Common": "5.0.0.0", - "System.Data.DataSetExtensions": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Diagnostics.Contracts": "5.0.0.0", - "System.Diagnostics.Debug": "5.0.0.0", - "System.Diagnostics.DiagnosticSource": "5.0.0.0", - "System.Diagnostics.EventLog": "5.0.0.0", - "System.Diagnostics.FileVersionInfo": "5.0.0.0", - "System.Diagnostics.Process": "5.0.0.0", - "System.Diagnostics.StackTrace": "5.0.0.0", - "System.Diagnostics.TextWriterTraceListener": "5.0.0.0", - "System.Diagnostics.Tools": "5.0.0.0", - "System.Diagnostics.TraceSource": "5.0.0.0", - "System.Diagnostics.Tracing": "5.0.0.0", - "System": "4.0.0.0", - "System.Drawing": "4.0.0.0", - "System.Drawing.Primitives": "5.0.0.0", - "System.Dynamic.Runtime": "5.0.0.0", - "System.Formats.Asn1": "5.0.0.0", - "System.Globalization.Calendars": "5.0.0.0", - "System.Globalization": "5.0.0.0", - "System.Globalization.Extensions": "5.0.0.0", - "System.IO.Compression.Brotli": "5.0.0.0", - "System.IO.Compression": "5.0.0.0", - "System.IO.Compression.FileSystem": "4.0.0.0", - "System.IO.Compression.ZipFile": "5.0.0.0", - "System.IO": "5.0.0.0", - "System.IO.FileSystem": "5.0.0.0", - "System.IO.FileSystem.DriveInfo": "5.0.0.0", - "System.IO.FileSystem.Primitives": "5.0.0.0", - "System.IO.FileSystem.Watcher": "5.0.0.0", - "System.IO.IsolatedStorage": "5.0.0.0", - "System.IO.MemoryMappedFiles": "5.0.0.0", - "System.IO.Pipelines": "5.0.0.0", - "System.IO.Pipes": "5.0.0.0", - "System.IO.UnmanagedMemoryStream": "5.0.0.0", - "System.Linq": "5.0.0.0", - "System.Linq.Expressions": "5.0.0.0", - "System.Linq.Parallel": "5.0.0.0", - "System.Linq.Queryable": "5.0.0.0", - "System.Memory": "5.0.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "5.0.0.0", - "System.Net.Http.Json": "5.0.0.0", - "System.Net.HttpListener": "5.0.0.0", - "System.Net.Mail": "5.0.0.0", - "System.Net.NameResolution": "5.0.0.0", - "System.Net.NetworkInformation": "5.0.0.0", - "System.Net.Ping": "5.0.0.0", - "System.Net.Primitives": "5.0.0.0", - "System.Net.Requests": "5.0.0.0", - "System.Net.Security": "5.0.0.0", - "System.Net.ServicePoint": "5.0.0.0", - "System.Net.Sockets": "5.0.0.0", - "System.Net.WebClient": "5.0.0.0", - "System.Net.WebHeaderCollection": "5.0.0.0", - "System.Net.WebProxy": "5.0.0.0", - "System.Net.WebSockets.Client": "5.0.0.0", - "System.Net.WebSockets": "5.0.0.0", - "System.Numerics": "4.0.0.0", - "System.Numerics.Vectors": "5.0.0.0", - "System.ObjectModel": "5.0.0.0", - "System.Reflection.DispatchProxy": "5.0.0.0", - "System.Reflection": "5.0.0.0", - "System.Reflection.Emit": "5.0.0.0", - "System.Reflection.Emit.ILGeneration": "5.0.0.0", - "System.Reflection.Emit.Lightweight": "5.0.0.0", - "System.Reflection.Extensions": "5.0.0.0", - "System.Reflection.Metadata": "5.0.0.0", - "System.Reflection.Primitives": "5.0.0.0", - "System.Reflection.TypeExtensions": "5.0.0.0", - "System.Resources.Reader": "5.0.0.0", - "System.Resources.ResourceManager": "5.0.0.0", - "System.Resources.Writer": "5.0.0.0", - "System.Runtime.CompilerServices.Unsafe": "5.0.0.0", - "System.Runtime.CompilerServices.VisualC": "5.0.0.0", - "System.Runtime": "5.0.0.0", - "System.Runtime.Extensions": "5.0.0.0", - "System.Runtime.Handles": "5.0.0.0", - "System.Runtime.InteropServices": "5.0.0.0", - "System.Runtime.InteropServices.RuntimeInformation": "5.0.0.0", - "System.Runtime.Intrinsics": "5.0.0.0", - "System.Runtime.Loader": "5.0.0.0", - "System.Runtime.Numerics": "5.0.0.0", - "System.Runtime.Serialization": "4.0.0.0", - "System.Runtime.Serialization.Formatters": "5.0.0.0", - "System.Runtime.Serialization.Json": "5.0.0.0", - "System.Runtime.Serialization.Primitives": "5.0.0.0", - "System.Runtime.Serialization.Xml": "5.0.0.0", - "System.Security.AccessControl": "5.0.0.0", - "System.Security.Claims": "5.0.0.0", - "System.Security.Cryptography.Algorithms": "5.0.0.0", - "System.Security.Cryptography.Cng": "5.0.0.0", - "System.Security.Cryptography.Csp": "5.0.0.0", - "System.Security.Cryptography.Encoding": "5.0.0.0", - "System.Security.Cryptography.Primitives": "5.0.0.0", - "System.Security.Cryptography.X509Certificates": "5.0.0.0", - "System.Security.Cryptography.Xml": "5.0.0.0", - "System.Security": "4.0.0.0", - "System.Security.Permissions": "5.0.0.0", - "System.Security.Principal": "5.0.0.0", - "System.Security.Principal.Windows": "5.0.0.0", - "System.Security.SecureString": "5.0.0.0", - "System.ServiceModel.Web": "4.0.0.0", - "System.ServiceProcess": "4.0.0.0", - "System.Text.Encoding.CodePages": "5.0.0.0", - "System.Text.Encoding": "5.0.0.0", - "System.Text.Encoding.Extensions": "5.0.0.0", - "System.Text.Encodings.Web": "5.0.0.0", - "System.Text.Json": "5.0.0.0", - "System.Text.RegularExpressions": "5.0.0.0", - "System.Threading.Channels": "5.0.0.0", - "System.Threading": "5.0.0.0", - "System.Threading.Overlapped": "5.0.0.0", - "System.Threading.Tasks.Dataflow": "5.0.0.0", - "System.Threading.Tasks": "5.0.0.0", - "System.Threading.Tasks.Extensions": "5.0.0.0", - "System.Threading.Tasks.Parallel": "5.0.0.0", - "System.Threading.Thread": "5.0.0.0", - "System.Threading.ThreadPool": "5.0.0.0", - "System.Threading.Timer": "5.0.0.0", - "System.Transactions": "4.0.0.0", - "System.Transactions.Local": "5.0.0.0", - "System.ValueTuple": "4.0.3.0", - "System.Web": "4.0.0.0", - "System.Web.HttpUtility": "5.0.0.0", - "System.Windows": "4.0.0.0", - "System.Windows.Extensions": "5.0.0.0", - "System.Xml": "4.0.0.0", - "System.Xml.Linq": "4.0.0.0", - "System.Xml.ReaderWriter": "5.0.0.0", - "System.Xml.Serialization": "4.0.0.0", - "System.Xml.XDocument": "5.0.0.0", - "System.Xml.XmlDocument": "5.0.0.0", - "System.Xml.XmlSerializer": "5.0.0.0", - "System.Xml.XPath": "5.0.0.0", - "System.Xml.XPath.XDocument": "5.0.0.0", - "WindowsBase": "4.0.0.0" - }, - "runtime": { - "ApiServer.dll": {} - }, - "compile": { - "ApiServer.dll": {} - } - }, - "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "5.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {}, - "Microsoft.Extensions.Logging/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "5.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "5.0.0", - "Microsoft.Extensions.Options": "5.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions/5.0.0": {}, - "Microsoft.Extensions.Options/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", - "Microsoft.Extensions.Primitives": "5.0.0" - } - }, - "Microsoft.Extensions.Primitives/5.0.0": {}, - "Newtonsoft.Json/13.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.1.25517" - } - }, - "compile": { - "lib/netstandard2.0/Newtonsoft.Json.dll": {} - } - }, - "NLog/4.7.10": { - "runtime": { - "lib/netstandard2.0/NLog.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.7.10.13013" - } - }, - "compile": { - "lib/netstandard2.0/NLog.dll": {} - } - }, - "NLog.Extensions.Logging/1.7.2": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", - "Microsoft.Extensions.Logging": "5.0.0", - "NLog": "4.7.10" - }, - "runtime": { - "lib/net5.0/NLog.Extensions.Logging.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.7.2.1548" - } - }, - "compile": { - "lib/net5.0/NLog.Extensions.Logging.dll": {} - } - }, - "DataClient/0.0.3": { - "dependencies": { - "NLog": "4.7.10", - "NLog.Extensions.Logging": "1.7.2", - "Newtonsoft.Json": "13.0.1" - }, - "runtime": { - "DataClient.dll": {} - }, - "compile": { - "DataClient.dll": {} - } - }, - "Microsoft.AspNetCore.Antiforgery/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Antiforgery.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authentication.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authentication.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authentication.Cookies/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authentication.Cookies.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authentication.Core/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authentication.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authentication/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authentication.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authentication.OAuth/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authentication.OAuth.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authorization/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authorization.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Authorization.Policy/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Authorization.Policy.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Components.Authorization/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Components.Authorization.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Components/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Components.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Components.Forms/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Components.Forms.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Components.Server/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Components.Server.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Components.Web/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Components.Web.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Connections.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Connections.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.CookiePolicy/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.CookiePolicy.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Cors/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Cors.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Cryptography.Internal/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Cryptography.Internal.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Cryptography.KeyDerivation/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Cryptography.KeyDerivation.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.DataProtection.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.DataProtection.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.DataProtection/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.DataProtection.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.DataProtection.Extensions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.DataProtection.Extensions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Diagnostics.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Diagnostics.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Diagnostics/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Diagnostics.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Diagnostics.HealthChecks/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Diagnostics.HealthChecks.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.HostFiltering/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.HostFiltering.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Hosting.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Hosting.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Hosting/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Hosting.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Html.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Html.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http.Connections.Common/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.Connections.Common.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http.Connections/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.Connections.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http.Extensions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.Extensions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Http.Features/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Http.Features.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.HttpOverrides/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.HttpOverrides.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.HttpsPolicy/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.HttpsPolicy.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Identity/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Identity.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Localization/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Localization.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Localization.Routing/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Localization.Routing.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Metadata/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Metadata.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.ApiExplorer/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.ApiExplorer.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Core/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Cors/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Cors.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.DataAnnotations/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.DataAnnotations.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Formatters.Json/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Formatters.Json.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Formatters.Xml/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Formatters.Xml.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Localization/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Localization.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.Razor/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.Razor.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.RazorPages/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.RazorPages.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.TagHelpers/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.TagHelpers.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Mvc.ViewFeatures/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Mvc.ViewFeatures.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Razor/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Razor.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Razor.Runtime/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Razor.Runtime.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.ResponseCaching.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.ResponseCaching.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.ResponseCaching/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.ResponseCaching.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.ResponseCompression/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.ResponseCompression.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Rewrite/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Rewrite.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Routing.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Routing.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Routing/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Routing.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.HttpSys/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.HttpSys.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.IIS/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.IIS.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.IISIntegration/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.IISIntegration.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.Kestrel.Core/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.Kestrel.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.Kestrel/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.Kestrel.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.Session/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.Session.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.SignalR.Common/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.SignalR.Common.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.SignalR.Core/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.SignalR.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.SignalR/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.SignalR.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.SignalR.Protocols.Json/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.SignalR.Protocols.Json.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.StaticFiles/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.StaticFiles.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.WebSockets/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.WebSockets.dll": {} - }, - "compileOnly": true - }, - "Microsoft.AspNetCore.WebUtilities/5.0.0.0": { - "compile": { - "Microsoft.AspNetCore.WebUtilities.dll": {} - }, - "compileOnly": true - }, - "Microsoft.CSharp/5.0.0.0": { - "compile": { - "Microsoft.CSharp.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Caching.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Caching.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Caching.Memory/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Caching.Memory.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.Abstractions.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.Binder/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.Binder.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.CommandLine/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.CommandLine.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.EnvironmentVariables.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.FileExtensions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.FileExtensions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.Ini/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.Ini.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.Json/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.Json.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.KeyPerFile/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.KeyPerFile.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.UserSecrets/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.UserSecrets.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Configuration.Xml/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Configuration.Xml.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.DependencyInjection.Abstractions.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.DependencyInjection.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.DependencyInjection.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.DependencyInjection.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Diagnostics.HealthChecks/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Diagnostics.HealthChecks.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.FileProviders.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.FileProviders.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.FileProviders.Composite/5.0.0.0": { - "compile": { - "Microsoft.Extensions.FileProviders.Composite.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.FileProviders.Embedded/5.0.0.0": { - "compile": { - "Microsoft.Extensions.FileProviders.Embedded.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.FileProviders.Physical/5.0.0.0": { - "compile": { - "Microsoft.Extensions.FileProviders.Physical.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.FileSystemGlobbing/5.0.0.0": { - "compile": { - "Microsoft.Extensions.FileSystemGlobbing.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Hosting.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Hosting.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Hosting/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Hosting.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Http/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Http.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Identity.Core/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Identity.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Identity.Stores/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Identity.Stores.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Localization.Abstractions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Localization.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Localization/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Localization.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.Abstractions.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.Abstractions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.Configuration/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.Configuration.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.Console/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.Console.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.Debug/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.Debug.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.EventLog/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.EventLog.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.EventSource/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.EventSource.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Logging.TraceSource/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Logging.TraceSource.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.ObjectPool/5.0.0.0": { - "compile": { - "Microsoft.Extensions.ObjectPool.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Options.ConfigurationExtensions/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Options.ConfigurationExtensions.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Options.DataAnnotations/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Options.DataAnnotations.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Options.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Options.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.Primitives.Reference/5.0.0.0": { - "compile": { - "Microsoft.Extensions.Primitives.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Extensions.WebEncoders/5.0.0.0": { - "compile": { - "Microsoft.Extensions.WebEncoders.dll": {} - }, - "compileOnly": true - }, - "Microsoft.JSInterop/5.0.0.0": { - "compile": { - "Microsoft.JSInterop.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Net.Http.Headers/5.0.0.0": { - "compile": { - "Microsoft.Net.Http.Headers.dll": {} - }, - "compileOnly": true - }, - "Microsoft.VisualBasic.Core/10.0.6.0": { - "compile": { - "Microsoft.VisualBasic.Core.dll": {} - }, - "compileOnly": true - }, - "Microsoft.VisualBasic/10.0.0.0": { - "compile": { - "Microsoft.VisualBasic.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Win32.Primitives/5.0.0.0": { - "compile": { - "Microsoft.Win32.Primitives.dll": {} - }, - "compileOnly": true - }, - "Microsoft.Win32.Registry/5.0.0.0": { - "compile": { - "Microsoft.Win32.Registry.dll": {} - }, - "compileOnly": true - }, - "mscorlib/4.0.0.0": { - "compile": { - "mscorlib.dll": {} - }, - "compileOnly": true - }, - "netstandard/2.1.0.0": { - "compile": { - "netstandard.dll": {} - }, - "compileOnly": true - }, - "System.AppContext/5.0.0.0": { - "compile": { - "System.AppContext.dll": {} - }, - "compileOnly": true - }, - "System.Buffers/5.0.0.0": { - "compile": { - "System.Buffers.dll": {} - }, - "compileOnly": true - }, - "System.Collections.Concurrent/5.0.0.0": { - "compile": { - "System.Collections.Concurrent.dll": {} - }, - "compileOnly": true - }, - "System.Collections/5.0.0.0": { - "compile": { - "System.Collections.dll": {} - }, - "compileOnly": true - }, - "System.Collections.Immutable/5.0.0.0": { - "compile": { - "System.Collections.Immutable.dll": {} - }, - "compileOnly": true - }, - "System.Collections.NonGeneric/5.0.0.0": { - "compile": { - "System.Collections.NonGeneric.dll": {} - }, - "compileOnly": true - }, - "System.Collections.Specialized/5.0.0.0": { - "compile": { - "System.Collections.Specialized.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel.Annotations/5.0.0.0": { - "compile": { - "System.ComponentModel.Annotations.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel.DataAnnotations/4.0.0.0": { - "compile": { - "System.ComponentModel.DataAnnotations.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel/5.0.0.0": { - "compile": { - "System.ComponentModel.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel.EventBasedAsync/5.0.0.0": { - "compile": { - "System.ComponentModel.EventBasedAsync.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel.Primitives/5.0.0.0": { - "compile": { - "System.ComponentModel.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.ComponentModel.TypeConverter/5.0.0.0": { - "compile": { - "System.ComponentModel.TypeConverter.dll": {} - }, - "compileOnly": true - }, - "System.Configuration/4.0.0.0": { - "compile": { - "System.Configuration.dll": {} - }, - "compileOnly": true - }, - "System.Console/5.0.0.0": { - "compile": { - "System.Console.dll": {} - }, - "compileOnly": true - }, - "System.Core/4.0.0.0": { - "compile": { - "System.Core.dll": {} - }, - "compileOnly": true - }, - "System.Data.Common/5.0.0.0": { - "compile": { - "System.Data.Common.dll": {} - }, - "compileOnly": true - }, - "System.Data.DataSetExtensions/4.0.0.0": { - "compile": { - "System.Data.DataSetExtensions.dll": {} - }, - "compileOnly": true - }, - "System.Data/4.0.0.0": { - "compile": { - "System.Data.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.Contracts/5.0.0.0": { - "compile": { - "System.Diagnostics.Contracts.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.Debug/5.0.0.0": { - "compile": { - "System.Diagnostics.Debug.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.DiagnosticSource/5.0.0.0": { - "compile": { - "System.Diagnostics.DiagnosticSource.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.EventLog/5.0.0.0": { - "compile": { - "System.Diagnostics.EventLog.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.FileVersionInfo/5.0.0.0": { - "compile": { - "System.Diagnostics.FileVersionInfo.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.Process/5.0.0.0": { - "compile": { - "System.Diagnostics.Process.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.StackTrace/5.0.0.0": { - "compile": { - "System.Diagnostics.StackTrace.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.TextWriterTraceListener/5.0.0.0": { - "compile": { - "System.Diagnostics.TextWriterTraceListener.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.Tools/5.0.0.0": { - "compile": { - "System.Diagnostics.Tools.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.TraceSource/5.0.0.0": { - "compile": { - "System.Diagnostics.TraceSource.dll": {} - }, - "compileOnly": true - }, - "System.Diagnostics.Tracing/5.0.0.0": { - "compile": { - "System.Diagnostics.Tracing.dll": {} - }, - "compileOnly": true - }, - "System/4.0.0.0": { - "compile": { - "System.dll": {} - }, - "compileOnly": true - }, - "System.Drawing/4.0.0.0": { - "compile": { - "System.Drawing.dll": {} - }, - "compileOnly": true - }, - "System.Drawing.Primitives/5.0.0.0": { - "compile": { - "System.Drawing.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.Dynamic.Runtime/5.0.0.0": { - "compile": { - "System.Dynamic.Runtime.dll": {} - }, - "compileOnly": true - }, - "System.Formats.Asn1/5.0.0.0": { - "compile": { - "System.Formats.Asn1.dll": {} - }, - "compileOnly": true - }, - "System.Globalization.Calendars/5.0.0.0": { - "compile": { - "System.Globalization.Calendars.dll": {} - }, - "compileOnly": true - }, - "System.Globalization/5.0.0.0": { - "compile": { - "System.Globalization.dll": {} - }, - "compileOnly": true - }, - "System.Globalization.Extensions/5.0.0.0": { - "compile": { - "System.Globalization.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.IO.Compression.Brotli/5.0.0.0": { - "compile": { - "System.IO.Compression.Brotli.dll": {} - }, - "compileOnly": true - }, - "System.IO.Compression/5.0.0.0": { - "compile": { - "System.IO.Compression.dll": {} - }, - "compileOnly": true - }, - "System.IO.Compression.FileSystem/4.0.0.0": { - "compile": { - "System.IO.Compression.FileSystem.dll": {} - }, - "compileOnly": true - }, - "System.IO.Compression.ZipFile/5.0.0.0": { - "compile": { - "System.IO.Compression.ZipFile.dll": {} - }, - "compileOnly": true - }, - "System.IO/5.0.0.0": { - "compile": { - "System.IO.dll": {} - }, - "compileOnly": true - }, - "System.IO.FileSystem/5.0.0.0": { - "compile": { - "System.IO.FileSystem.dll": {} - }, - "compileOnly": true - }, - "System.IO.FileSystem.DriveInfo/5.0.0.0": { - "compile": { - "System.IO.FileSystem.DriveInfo.dll": {} - }, - "compileOnly": true - }, - "System.IO.FileSystem.Primitives/5.0.0.0": { - "compile": { - "System.IO.FileSystem.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.IO.FileSystem.Watcher/5.0.0.0": { - "compile": { - "System.IO.FileSystem.Watcher.dll": {} - }, - "compileOnly": true - }, - "System.IO.IsolatedStorage/5.0.0.0": { - "compile": { - "System.IO.IsolatedStorage.dll": {} - }, - "compileOnly": true - }, - "System.IO.MemoryMappedFiles/5.0.0.0": { - "compile": { - "System.IO.MemoryMappedFiles.dll": {} - }, - "compileOnly": true - }, - "System.IO.Pipelines/5.0.0.0": { - "compile": { - "System.IO.Pipelines.dll": {} - }, - "compileOnly": true - }, - "System.IO.Pipes/5.0.0.0": { - "compile": { - "System.IO.Pipes.dll": {} - }, - "compileOnly": true - }, - "System.IO.UnmanagedMemoryStream/5.0.0.0": { - "compile": { - "System.IO.UnmanagedMemoryStream.dll": {} - }, - "compileOnly": true - }, - "System.Linq/5.0.0.0": { - "compile": { - "System.Linq.dll": {} - }, - "compileOnly": true - }, - "System.Linq.Expressions/5.0.0.0": { - "compile": { - "System.Linq.Expressions.dll": {} - }, - "compileOnly": true - }, - "System.Linq.Parallel/5.0.0.0": { - "compile": { - "System.Linq.Parallel.dll": {} - }, - "compileOnly": true - }, - "System.Linq.Queryable/5.0.0.0": { - "compile": { - "System.Linq.Queryable.dll": {} - }, - "compileOnly": true - }, - "System.Memory/5.0.0.0": { - "compile": { - "System.Memory.dll": {} - }, - "compileOnly": true - }, - "System.Net/4.0.0.0": { - "compile": { - "System.Net.dll": {} - }, - "compileOnly": true - }, - "System.Net.Http/5.0.0.0": { - "compile": { - "System.Net.Http.dll": {} - }, - "compileOnly": true - }, - "System.Net.Http.Json/5.0.0.0": { - "compile": { - "System.Net.Http.Json.dll": {} - }, - "compileOnly": true - }, - "System.Net.HttpListener/5.0.0.0": { - "compile": { - "System.Net.HttpListener.dll": {} - }, - "compileOnly": true - }, - "System.Net.Mail/5.0.0.0": { - "compile": { - "System.Net.Mail.dll": {} - }, - "compileOnly": true - }, - "System.Net.NameResolution/5.0.0.0": { - "compile": { - "System.Net.NameResolution.dll": {} - }, - "compileOnly": true - }, - "System.Net.NetworkInformation/5.0.0.0": { - "compile": { - "System.Net.NetworkInformation.dll": {} - }, - "compileOnly": true - }, - "System.Net.Ping/5.0.0.0": { - "compile": { - "System.Net.Ping.dll": {} - }, - "compileOnly": true - }, - "System.Net.Primitives/5.0.0.0": { - "compile": { - "System.Net.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.Net.Requests/5.0.0.0": { - "compile": { - "System.Net.Requests.dll": {} - }, - "compileOnly": true - }, - "System.Net.Security/5.0.0.0": { - "compile": { - "System.Net.Security.dll": {} - }, - "compileOnly": true - }, - "System.Net.ServicePoint/5.0.0.0": { - "compile": { - "System.Net.ServicePoint.dll": {} - }, - "compileOnly": true - }, - "System.Net.Sockets/5.0.0.0": { - "compile": { - "System.Net.Sockets.dll": {} - }, - "compileOnly": true - }, - "System.Net.WebClient/5.0.0.0": { - "compile": { - "System.Net.WebClient.dll": {} - }, - "compileOnly": true - }, - "System.Net.WebHeaderCollection/5.0.0.0": { - "compile": { - "System.Net.WebHeaderCollection.dll": {} - }, - "compileOnly": true - }, - "System.Net.WebProxy/5.0.0.0": { - "compile": { - "System.Net.WebProxy.dll": {} - }, - "compileOnly": true - }, - "System.Net.WebSockets.Client/5.0.0.0": { - "compile": { - "System.Net.WebSockets.Client.dll": {} - }, - "compileOnly": true - }, - "System.Net.WebSockets/5.0.0.0": { - "compile": { - "System.Net.WebSockets.dll": {} - }, - "compileOnly": true - }, - "System.Numerics/4.0.0.0": { - "compile": { - "System.Numerics.dll": {} - }, - "compileOnly": true - }, - "System.Numerics.Vectors/5.0.0.0": { - "compile": { - "System.Numerics.Vectors.dll": {} - }, - "compileOnly": true - }, - "System.ObjectModel/5.0.0.0": { - "compile": { - "System.ObjectModel.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.DispatchProxy/5.0.0.0": { - "compile": { - "System.Reflection.DispatchProxy.dll": {} - }, - "compileOnly": true - }, - "System.Reflection/5.0.0.0": { - "compile": { - "System.Reflection.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Emit/5.0.0.0": { - "compile": { - "System.Reflection.Emit.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Emit.ILGeneration/5.0.0.0": { - "compile": { - "System.Reflection.Emit.ILGeneration.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Emit.Lightweight/5.0.0.0": { - "compile": { - "System.Reflection.Emit.Lightweight.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Extensions/5.0.0.0": { - "compile": { - "System.Reflection.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Metadata/5.0.0.0": { - "compile": { - "System.Reflection.Metadata.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.Primitives/5.0.0.0": { - "compile": { - "System.Reflection.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.Reflection.TypeExtensions/5.0.0.0": { - "compile": { - "System.Reflection.TypeExtensions.dll": {} - }, - "compileOnly": true - }, - "System.Resources.Reader/5.0.0.0": { - "compile": { - "System.Resources.Reader.dll": {} - }, - "compileOnly": true - }, - "System.Resources.ResourceManager/5.0.0.0": { - "compile": { - "System.Resources.ResourceManager.dll": {} - }, - "compileOnly": true - }, - "System.Resources.Writer/5.0.0.0": { - "compile": { - "System.Resources.Writer.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.CompilerServices.Unsafe/5.0.0.0": { - "compile": { - "System.Runtime.CompilerServices.Unsafe.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.CompilerServices.VisualC/5.0.0.0": { - "compile": { - "System.Runtime.CompilerServices.VisualC.dll": {} - }, - "compileOnly": true - }, - "System.Runtime/5.0.0.0": { - "compile": { - "System.Runtime.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Extensions/5.0.0.0": { - "compile": { - "System.Runtime.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Handles/5.0.0.0": { - "compile": { - "System.Runtime.Handles.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.InteropServices/5.0.0.0": { - "compile": { - "System.Runtime.InteropServices.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.InteropServices.RuntimeInformation/5.0.0.0": { - "compile": { - "System.Runtime.InteropServices.RuntimeInformation.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Intrinsics/5.0.0.0": { - "compile": { - "System.Runtime.Intrinsics.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Loader/5.0.0.0": { - "compile": { - "System.Runtime.Loader.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Numerics/5.0.0.0": { - "compile": { - "System.Runtime.Numerics.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Serialization/4.0.0.0": { - "compile": { - "System.Runtime.Serialization.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Serialization.Formatters/5.0.0.0": { - "compile": { - "System.Runtime.Serialization.Formatters.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Serialization.Json/5.0.0.0": { - "compile": { - "System.Runtime.Serialization.Json.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Serialization.Primitives/5.0.0.0": { - "compile": { - "System.Runtime.Serialization.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.Runtime.Serialization.Xml/5.0.0.0": { - "compile": { - "System.Runtime.Serialization.Xml.dll": {} - }, - "compileOnly": true - }, - "System.Security.AccessControl/5.0.0.0": { - "compile": { - "System.Security.AccessControl.dll": {} - }, - "compileOnly": true - }, - "System.Security.Claims/5.0.0.0": { - "compile": { - "System.Security.Claims.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Algorithms/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Algorithms.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Cng/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Cng.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Csp/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Csp.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Encoding/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Encoding.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Primitives/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Primitives.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.X509Certificates/5.0.0.0": { - "compile": { - "System.Security.Cryptography.X509Certificates.dll": {} - }, - "compileOnly": true - }, - "System.Security.Cryptography.Xml/5.0.0.0": { - "compile": { - "System.Security.Cryptography.Xml.dll": {} - }, - "compileOnly": true - }, - "System.Security/4.0.0.0": { - "compile": { - "System.Security.dll": {} - }, - "compileOnly": true - }, - "System.Security.Permissions/5.0.0.0": { - "compile": { - "System.Security.Permissions.dll": {} - }, - "compileOnly": true - }, - "System.Security.Principal/5.0.0.0": { - "compile": { - "System.Security.Principal.dll": {} - }, - "compileOnly": true - }, - "System.Security.Principal.Windows/5.0.0.0": { - "compile": { - "System.Security.Principal.Windows.dll": {} - }, - "compileOnly": true - }, - "System.Security.SecureString/5.0.0.0": { - "compile": { - "System.Security.SecureString.dll": {} - }, - "compileOnly": true - }, - "System.ServiceModel.Web/4.0.0.0": { - "compile": { - "System.ServiceModel.Web.dll": {} - }, - "compileOnly": true - }, - "System.ServiceProcess/4.0.0.0": { - "compile": { - "System.ServiceProcess.dll": {} - }, - "compileOnly": true - }, - "System.Text.Encoding.CodePages/5.0.0.0": { - "compile": { - "System.Text.Encoding.CodePages.dll": {} - }, - "compileOnly": true - }, - "System.Text.Encoding/5.0.0.0": { - "compile": { - "System.Text.Encoding.dll": {} - }, - "compileOnly": true - }, - "System.Text.Encoding.Extensions/5.0.0.0": { - "compile": { - "System.Text.Encoding.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.Text.Encodings.Web/5.0.0.0": { - "compile": { - "System.Text.Encodings.Web.dll": {} - }, - "compileOnly": true - }, - "System.Text.Json/5.0.0.0": { - "compile": { - "System.Text.Json.dll": {} - }, - "compileOnly": true - }, - "System.Text.RegularExpressions/5.0.0.0": { - "compile": { - "System.Text.RegularExpressions.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Channels/5.0.0.0": { - "compile": { - "System.Threading.Channels.dll": {} - }, - "compileOnly": true - }, - "System.Threading/5.0.0.0": { - "compile": { - "System.Threading.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Overlapped/5.0.0.0": { - "compile": { - "System.Threading.Overlapped.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Tasks.Dataflow/5.0.0.0": { - "compile": { - "System.Threading.Tasks.Dataflow.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Tasks/5.0.0.0": { - "compile": { - "System.Threading.Tasks.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Tasks.Extensions/5.0.0.0": { - "compile": { - "System.Threading.Tasks.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Tasks.Parallel/5.0.0.0": { - "compile": { - "System.Threading.Tasks.Parallel.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Thread/5.0.0.0": { - "compile": { - "System.Threading.Thread.dll": {} - }, - "compileOnly": true - }, - "System.Threading.ThreadPool/5.0.0.0": { - "compile": { - "System.Threading.ThreadPool.dll": {} - }, - "compileOnly": true - }, - "System.Threading.Timer/5.0.0.0": { - "compile": { - "System.Threading.Timer.dll": {} - }, - "compileOnly": true - }, - "System.Transactions/4.0.0.0": { - "compile": { - "System.Transactions.dll": {} - }, - "compileOnly": true - }, - "System.Transactions.Local/5.0.0.0": { - "compile": { - "System.Transactions.Local.dll": {} - }, - "compileOnly": true - }, - "System.ValueTuple/4.0.3.0": { - "compile": { - "System.ValueTuple.dll": {} - }, - "compileOnly": true - }, - "System.Web/4.0.0.0": { - "compile": { - "System.Web.dll": {} - }, - "compileOnly": true - }, - "System.Web.HttpUtility/5.0.0.0": { - "compile": { - "System.Web.HttpUtility.dll": {} - }, - "compileOnly": true - }, - "System.Windows/4.0.0.0": { - "compile": { - "System.Windows.dll": {} - }, - "compileOnly": true - }, - "System.Windows.Extensions/5.0.0.0": { - "compile": { - "System.Windows.Extensions.dll": {} - }, - "compileOnly": true - }, - "System.Xml/4.0.0.0": { - "compile": { - "System.Xml.dll": {} - }, - "compileOnly": true - }, - "System.Xml.Linq/4.0.0.0": { - "compile": { - "System.Xml.Linq.dll": {} - }, - "compileOnly": true - }, - "System.Xml.ReaderWriter/5.0.0.0": { - "compile": { - "System.Xml.ReaderWriter.dll": {} - }, - "compileOnly": true - }, - "System.Xml.Serialization/4.0.0.0": { - "compile": { - "System.Xml.Serialization.dll": {} - }, - "compileOnly": true - }, - "System.Xml.XDocument/5.0.0.0": { - "compile": { - "System.Xml.XDocument.dll": {} - }, - "compileOnly": true - }, - "System.Xml.XmlDocument/5.0.0.0": { - "compile": { - "System.Xml.XmlDocument.dll": {} - }, - "compileOnly": true - }, - "System.Xml.XmlSerializer/5.0.0.0": { - "compile": { - "System.Xml.XmlSerializer.dll": {} - }, - "compileOnly": true - }, - "System.Xml.XPath/5.0.0.0": { - "compile": { - "System.Xml.XPath.dll": {} - }, - "compileOnly": true - }, - "System.Xml.XPath.XDocument/5.0.0.0": { - "compile": { - "System.Xml.XPath.XDocument.dll": {} - }, - "compileOnly": true - }, - "WindowsBase/4.0.0.0": { - "compile": { - "WindowsBase.dll": {} - }, - "compileOnly": true - } - } - }, - "libraries": { - "ApiServer/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", - "path": "microsoft.extensions.configuration.abstractions/5.0.0", - "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", - "path": "microsoft.extensions.dependencyinjection/5.0.0", - "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", - "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", - "path": "microsoft.extensions.logging/5.0.0", - "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", - "path": "microsoft.extensions.logging.abstractions/5.0.0", - "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Options/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", - "path": "microsoft.extensions.options/5.0.0", - "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Primitives/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", - "path": "microsoft.extensions.primitives/5.0.0", - "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", - "path": "newtonsoft.json/13.0.1", - "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" - }, - "NLog/4.7.10": { - "type": "package", - "serviceable": true, - "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", - "path": "nlog/4.7.10", - "hashPath": "nlog.4.7.10.nupkg.sha512" - }, - "NLog.Extensions.Logging/1.7.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", - "path": "nlog.extensions.logging/1.7.2", - "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" - }, - "DataClient/0.0.3": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Antiforgery/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authentication.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authentication.Cookies/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authentication.Core/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authentication/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authentication.OAuth/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authorization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Authorization.Policy/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Components.Authorization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Components/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Components.Forms/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Components.Server/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Components.Web/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Connections.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.CookiePolicy/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Cors/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Cryptography.Internal/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Cryptography.KeyDerivation/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.DataProtection.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.DataProtection/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.DataProtection.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Diagnostics.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Diagnostics/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Diagnostics.HealthChecks/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.HostFiltering/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Hosting.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Hosting/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Html.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http.Connections.Common/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http.Connections/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Http.Features/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.HttpOverrides/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.HttpsPolicy/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Identity/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Localization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Localization.Routing/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Metadata/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.ApiExplorer/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Core/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Cors/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.DataAnnotations/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Formatters.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Formatters.Xml/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Localization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.Razor/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.RazorPages/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.TagHelpers/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Mvc.ViewFeatures/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Razor/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Razor.Runtime/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.ResponseCaching.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.ResponseCaching/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.ResponseCompression/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Rewrite/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Routing.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Routing/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.HttpSys/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.IIS/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.IISIntegration/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.Kestrel.Core/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.Kestrel/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Session/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.SignalR.Common/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.SignalR.Core/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.SignalR/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.SignalR.Protocols.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.StaticFiles/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.WebSockets/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.WebUtilities/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.CSharp/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Caching.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Caching.Memory/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Abstractions.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Binder/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.CommandLine/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.FileExtensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Ini/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.KeyPerFile/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.UserSecrets/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Xml/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.DependencyInjection.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Diagnostics.HealthChecks/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.FileProviders.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.FileProviders.Composite/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.FileProviders.Embedded/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.FileProviders.Physical/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.FileSystemGlobbing/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Hosting.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Hosting/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Http/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Identity.Core/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Identity.Stores/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Localization.Abstractions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Localization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.Abstractions.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.Configuration/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.Console/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.Debug/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.EventLog/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.EventSource/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Logging.TraceSource/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.ObjectPool/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Options.ConfigurationExtensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Options.DataAnnotations/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Options.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Primitives.Reference/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.WebEncoders/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.JSInterop/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Net.Http.Headers/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.VisualBasic.Core/10.0.6.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.VisualBasic/10.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Win32.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Win32.Registry/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "mscorlib/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "netstandard/2.1.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.AppContext/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Buffers/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Collections.Concurrent/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Collections/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Collections.Immutable/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Collections.NonGeneric/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Collections.Specialized/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel.Annotations/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel.DataAnnotations/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel.EventBasedAsync/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ComponentModel.TypeConverter/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Configuration/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Console/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Core/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Data.Common/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Data.DataSetExtensions/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Data/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.Contracts/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.Debug/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.DiagnosticSource/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.EventLog/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.FileVersionInfo/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.Process/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.StackTrace/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.TextWriterTraceListener/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.Tools/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.TraceSource/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Diagnostics.Tracing/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Drawing/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Drawing.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Dynamic.Runtime/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Formats.Asn1/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Globalization.Calendars/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Globalization/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Globalization.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Compression.Brotli/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Compression/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Compression.FileSystem/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Compression.ZipFile/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.FileSystem/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.FileSystem.DriveInfo/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.FileSystem.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.FileSystem.Watcher/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.IsolatedStorage/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.MemoryMappedFiles/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Pipelines/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.Pipes/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.IO.UnmanagedMemoryStream/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Linq/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Linq.Expressions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Linq.Parallel/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Linq.Queryable/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Memory/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Http/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Http.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.HttpListener/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Mail/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.NameResolution/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.NetworkInformation/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Ping/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Requests/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Security/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.ServicePoint/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.Sockets/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.WebClient/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.WebHeaderCollection/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.WebProxy/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.WebSockets.Client/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Net.WebSockets/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Numerics/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Numerics.Vectors/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ObjectModel/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.DispatchProxy/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Emit/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Emit.ILGeneration/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Emit.Lightweight/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Metadata/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Reflection.TypeExtensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Resources.Reader/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Resources.ResourceManager/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Resources.Writer/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.CompilerServices.Unsafe/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.CompilerServices.VisualC/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Handles/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.InteropServices/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.InteropServices.RuntimeInformation/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Intrinsics/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Loader/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Numerics/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Serialization/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Serialization.Formatters/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Serialization.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Serialization.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Runtime.Serialization.Xml/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.AccessControl/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Claims/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Algorithms/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Cng/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Csp/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Encoding/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Primitives/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.X509Certificates/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Cryptography.Xml/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Permissions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Principal/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.Principal.Windows/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Security.SecureString/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ServiceModel.Web/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ServiceProcess/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.Encoding.CodePages/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.Encoding/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.Encoding.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.Encodings.Web/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.Json/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Text.RegularExpressions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Channels/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Overlapped/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Tasks.Dataflow/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Tasks/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Tasks.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Tasks.Parallel/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Thread/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.ThreadPool/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Threading.Timer/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Transactions/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Transactions.Local/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.ValueTuple/4.0.3.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Web/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Web.HttpUtility/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Windows/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Windows.Extensions/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.Linq/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.ReaderWriter/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.Serialization/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.XDocument/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.XmlDocument/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.XmlSerializer/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.XPath/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "System.Xml.XPath.XDocument/5.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, - "WindowsBase/4.0.0.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/ApiServer/bin/Release/ApiServer.dll b/ApiServer/bin/Release/ApiServer.dll deleted file mode 100644 index dcb3aaa..0000000 Binary files a/ApiServer/bin/Release/ApiServer.dll and /dev/null differ diff --git a/ApiServer/bin/Release/ApiServer.pdb b/ApiServer/bin/Release/ApiServer.pdb deleted file mode 100644 index a90cc52..0000000 Binary files a/ApiServer/bin/Release/ApiServer.pdb and /dev/null differ diff --git a/ApiServer/bin/Release/ApiServer.runtimeconfig.json b/ApiServer/bin/Release/ApiServer.runtimeconfig.json deleted file mode 100644 index 93e2b02..0000000 --- a/ApiServer/bin/Release/ApiServer.runtimeconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net5.0", - "framework": { - "name": "Microsoft.AspNetCore.App", - "version": "5.0.0" - }, - "configProperties": { - "System.GC.Server": true, - "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false - } - } -} \ No newline at end of file diff --git a/ApiServer/bin/Release/DataClient.dll b/ApiServer/bin/Release/DataClient.dll deleted file mode 100644 index 9be7a0c..0000000 Binary files a/ApiServer/bin/Release/DataClient.dll and /dev/null differ diff --git a/ApiServer/bin/Release/appsettings.Development.json b/ApiServer/bin/Release/appsettings.Development.json deleted file mode 100644 index 8983e0f..0000000 --- a/ApiServer/bin/Release/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - } -} diff --git a/ApiServer/bin/Release/appsettings.json b/ApiServer/bin/Release/appsettings.json deleted file mode 100644 index d9d9a9b..0000000 --- a/ApiServer/bin/Release/appsettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} diff --git a/ApiServer/bin/Release/net5.0/ApiServer.deps.json b/ApiServer/bin/Release/net5.0/ApiServer.deps.json index 0e5ca18..06bdfc1 100644 --- a/ApiServer/bin/Release/net5.0/ApiServer.deps.json +++ b/ApiServer/bin/Release/net5.0/ApiServer.deps.json @@ -36,6 +36,7 @@ "DataClient": "0.0.3", "NLog": "4.7.10", "Newtonsoft.Json": "13.0.1", + "SharpZipLib": "1.3.3", "Microsoft.AspNetCore.Antiforgery": "5.0.0.0", "Microsoft.AspNetCore.Authentication.Abstractions": "5.0.0.0", "Microsoft.AspNetCore.Authentication.Cookies": "5.0.0.0", @@ -392,6 +393,17 @@ "lib/net5.0/NLog.Extensions.Logging.dll": {} } }, + "SharpZipLib/1.3.3": { + "runtime": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": { + "assemblyVersion": "1.3.3.11", + "fileVersion": "1.3.3.11" + } + }, + "compile": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {} + } + }, "DataClient/0.0.3": { "dependencies": { "NLog": "4.7.10", @@ -2181,6 +2193,13 @@ "path": "nlog.extensions.logging/1.7.2", "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" }, + "SharpZipLib/1.3.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-N8+hwhsKZm25tDJfWpBSW7EGhH/R7EMuiX+KJ4C4u+fCWVc1lJ5zg1u3S1RPPVYgTqhx/C3hxrqUpi6RwK5+Tg==", + "path": "sharpziplib/1.3.3", + "hashPath": "sharpziplib.1.3.3.nupkg.sha512" + }, "DataClient/0.0.3": { "type": "project", "serviceable": false, diff --git a/ApiServer/bin/Release/net5.0/ApiServer.dll b/ApiServer/bin/Release/net5.0/ApiServer.dll index dcb3aaa..6e336e3 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.pdb b/ApiServer/bin/Release/net5.0/ApiServer.pdb index a90cc52..be8a1e7 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.pdb and b/ApiServer/bin/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/bin/Release/net5.0/Config/Colors.json b/ApiServer/bin/Release/net5.0/Config/Colors.json new file mode 100644 index 0000000..4a09cea --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Colors.json @@ -0,0 +1,3 @@ +{ + "red" : "#ff0000" +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/Discret/all.json b/ApiServer/bin/Release/net5.0/Config/Discret/all.json new file mode 100644 index 0000000..506b7a3 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Discret/all.json @@ -0,0 +1,87 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { + "parent": [ "default" ], + "struct": [ + { + "index": 2, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + } + ] + }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { + "parent": [ "default" ], + "struct": [ + { + "index": 1, + "name": " (.)", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + } + ] + + }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/Discret/default.json b/ApiServer/bin/Release/net5.0/Config/Discret/default.json new file mode 100644 index 0000000..4969fef --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Discret/default.json @@ -0,0 +1,823 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Дискрет №0", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 0 + } + ] + }, + { + "index": 1, + "name": "P1 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 1 + } + ] + }, + { + "index": 2, + "name": "P2 воды кристаллизатора", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 2 + } + ] + }, + { + "index": 3, + "name": "Вода камеры", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 3 + } + ] + }, + { + "index": 4, + "name": "Вода штока", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 46, + "bit_index": 4 + } + ] + }, + { + "index": 5, + "name": "Дверь - А", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 5 + } + ] + }, + { + "index": 6, + "name": "Дверь - Б", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 6 + } + ] + }, + { + "index": 7, + "name": "Дверь - В", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 46, + "bit_index": 7 + } + ] + }, + { + "index": 8, + "name": "Дверь - Г", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 0 + } + ] + }, + { + "index": 9, + "name": "Дверь - Д", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 1 + } + ] + }, + { + "index": 10, + "name": "Люк", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 2 + } + ] + }, + { + "index": 11, + "name": "Пенал", + "state_struct": "open_close_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 3 + } + ] + }, + { + "index": 12, + "name": "Упоры", + "state_struct": "out_in_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 4 + } + ] + }, + { + "index": 13, + "name": "Прижимы", + "state_struct": "spinn_clamp_ok", + "bits": [ + { + "byte_index": 47, + "bit_index": 5 + } + ] + }, + { + "index": 14, + "name": "Вакуумный выключатель", + "state_struct": "none_on_off_err_3_4", + "bits": [ + { + "byte_index": 47, + "bit_index": 6 + }, + { + "byte_index": 47, + "bit_index": 7 + } + ] + }, + { + "index": 15, + "skip": true + }, + { + "index": 16, + "name": "\"Автоматика\"", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 7 + } + ] + }, + { + "index": 31, + "skip": true + }, + { + "index": 17, + "name": "БПС", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 1 + }, + { + "byte_index": 50, + "bit_index": 0 + } + ] + }, + { + "index": 32, + "skip": true + }, + { + "index": 18, + "name": "Соленоид", + "state_struct": "none_err_const_puls_1_2", + "bits": [ + { + "byte_index": 48, + "bit_index": 2 + }, + { + "byte_index": 48, + "bit_index": 3 + } + ] + }, + { + "index": 19, + "skip": true + }, + { + "index": 20, + "name": "ARPW", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 4 + }, + { + "byte_index": 48, + "bit_index": 7 + } + ] + }, + { + "index": 23, + "skip": true + }, + { + "index": 21, + "name": "ДВН", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 48, + "bit_index": 5 + }, + { + "byte_index": 49, + "bit_index": 3 + } + ] + }, + { + "index": 27, + "skip": true + }, + { + "index": 22, + "name": "SZO", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 48, + "bit_index": 6 + } + ] + }, + { + "index": 24, + "name": "ДУ-260", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 0 + }, + { + "byte_index": 49, + "bit_index": 1 + } + ] + }, + { + "index": 25, + "skip": true + }, + { + "index": 26, + "name": "ДУ-100", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 2 + }, + { + "byte_index": 50, + "bit_index": 2 + } + ] + }, + { + "index": 34, + "skip": true + }, + { + "index": 28, + "name": "ДУ-32", + "state_struct": "none_open_close_err_4", + "bits": [ + { + "byte_index": 49, + "bit_index": 4 + }, + { + "byte_index": 50, + "bit_index": 3 + } + ] + }, + { + "index": 35, + "skip": true + }, + { + "index": 29, + "name": "Шток вверху", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 5 + } + ] + }, + { + "index": 30, + "name": "Шток внизу", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 49, + "bit_index": 6 + } + ] + }, + { + "index": 33, + "name": "Плохой вакуум", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 1 + } + ] + }, + { + "index": 36, + "name": "Напряжение аварийной сигнализации", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 50, + "bit_index": 4 + } + ] + }, + { + "index": 37, + "name": "Взрывной клапан", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 50, + "bit_index": 5 + } + ] + }, + { + "index": 38, + "name": "Ключ УП в положении \"Автоматика\"", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 6 + } + ] + }, + { + "index": 39, + "name": "off_on_err", + "state_struct": "Реле \"Авария источника\"", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 40, + "name": "Сброс звуковой сигнализации", + "state_struct": "spinn_press", + "bits": [ + { + "byte_index": 51, + "bit_index": 0 + } + ] + }, + { + "index": 41, + "name": "Вакуум по ЭКМВ", + "state_struct": "have_no_err", + "bits": [ + { + "byte_index": 51, + "bit_index": 1 + } + ] + }, + { + "index": 42, + "name": "Реле \"Имитация тока дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 2 + } + ] + }, + { + "index": 43, + "name": "Реле \"АУ током дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 3 + } + ] + }, + { + "index": 44, + "name": "Реле \"Имитация напряжения дуги\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 4 + } + ] + }, + { + "index": 45, + "name": "Реле \"Имитация вакуума печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 5 + } + ] + }, + { + "index": 46, + "name": "Реле \"Имитация T воды кристаллизатора\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 6 + } + ] + }, + { + "index": 47, + "name": "Реле \"Имитация T воды вакуумкамеры\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 51, + "bit_index": 7 + } + ] + }, + { + "index": 48, + "name": "Реле \"Имитация T воды штока\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 0 + } + ] + }, + { + "index": 49, + "name": "Реле 1 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 1 + } + ] + }, + { + "index": 50, + "name": "Реле 2 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 2 + } + ] + }, + { + "index": 51, + "name": "Реле 3 \"Измерение изоляции\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 3 + } + ] + }, + { + "index": 52, + "name": "Реле 4 \"Контроль метрологии\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 4 + } + ] + }, + { + "index": 53, + "name": "Реле 5 \"Измерение изоляции (соленоид)\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 5 + } + ] + }, + { + "index": 54, + "name": "Реле \"АУ штоком\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 6 + } + ] + }, + { + "index": 55, + "name": "Реле \"Включение Uкалибровки\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 52, + "bit_index": 7 + } + ] + }, + { + "index": 56, + "name": "Реле \"Движение штока вверх\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 0 + } + ] + }, + { + "index": 57, + "name": "УП в положении КЗ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 1 + } + ] + }, + { + "index": 58, + "name": "Нет питания, включено \"резервное\" UPS", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 2 + } + ] + }, + { + "index": 59, + "name": "Вода подставки", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 3 + } + ] + }, + { + "index": 60, + "name": "Реле \"Разрешение на вакуумирование печи\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 53, + "bit_index": 4 + } + ] + }, + { + "index": 61, + "name": "Низкий заряд аккумулятора UPS", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 5 + } + ] + }, + { + "index": 62, + "name": "КВ рамы", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 53, + "bit_index": 6 + } + ] + }, + { + "index": 63, + "name": "Источник: +24В", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 64, + "name": "Реле \"Движение штока вниз\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 0 + } + ] + }, + { + "index": 65, + "name": "Проверка источника", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 1 + } + ] + }, + { + "index": 66, + "name": "Станция", + "state_struct": "none_on_off_err_4", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + }, + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 67, + "skip": true + }, + { + "index": 68, + "name": "Постоянное U=220В", + "state_struct": "no_have", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": "Источник готов", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 70, + "name": "Авария привода", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 6 + } + ] + }, + { + "index": 71, + "name": "Реле \"Напуск газа в печь\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 54, + "bit_index": 7 + } + ] + }, + { + "index": 74, + "name": "Реле \"АУ током дуги ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 76, + "name": "Готовность привода", + "state_struct": "no_have_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 4 + } + ] + }, + { + "index": 78, + "name": "Реле \"Авария источника ВДП №46\"", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 6 + } + ] + }, + { + "index": 79, + "name": "Клапан подачи аргона", + "state_struct": "close_open_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 7 + } + ] + }, + { + "index": 95, + "name": "Разрешение на вкл. вакуумного выключателя", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 57, + "bit_index": 7 + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/Discret/power_new.json b/ApiServer/bin/Release/net5.0/Config/Discret/power_new.json new file mode 100644 index 0000000..5fd7d88 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Discret/power_new.json @@ -0,0 +1,127 @@ +{ + "power_new": { + "struct": [ + { + "index": 39, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 50, + "bit_index": 7 + } + ] + }, + { + "index": 63, + "name": " ", + "state_struct": "no_yes", + "bits": [ + { + "byte_index": 53, + "bit_index": 7 + } + ] + }, + { + "index": 66, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 2 + } + ] + }, + { + "index": 67, + "name": ". ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 3 + } + ] + }, + { + "index": 68, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 4 + } + ] + }, + { + "index": 69, + "name": " ", + "state_struct": "off_on_err", + "bits": [ + { + "byte_index": 54, + "bit_index": 5 + } + ] + }, + { + "index": 72, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 0 + } + ] + }, + { + "index": 73, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 1 + } + ] + }, + { + "index": 74, + "name": " ", + "state_struct": "no_yes_ok", + "bits": [ + { + "byte_index": 55, + "bit_index": 2 + } + ] + }, + { + "index": 75, + "name": " ", + "state_struct": "no_yes_err", + "bits": [ + { + "byte_index": 55, + "bit_index": 3 + } + ] + }, + { + "index": 77, + "name": " ", + "state_struct": "off_on", + "bits": [ + { + "byte_index": 55, + "bit_index": 5 + } + ] + } + ] + } +} diff --git a/ApiServer/bin/Release/net5.0/Config/Metrics.json b/ApiServer/bin/Release/net5.0/Config/Metrics.json new file mode 100644 index 0000000..e0b5f48 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Metrics.json @@ -0,0 +1,13 @@ +{ + "кА": false, + "В": false, + "А": false, + "гр.С": false, + "мм": false, + "мкм.рт.ст": true, + "м^3/ч": false, + "кгс/см^2": false, + "мм.рт.ст": true, + "МВт": false, + "Гц": true +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/Protect/all.json b/ApiServer/bin/Release/net5.0/Config/Protect/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Protect/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/Protect/default.json b/ApiServer/bin/Release/net5.0/Config/Protect/default.json new file mode 100644 index 0000000..8bea6f7 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/Protect/default.json @@ -0,0 +1,356 @@ +{ + "default": { + "struct": [ + { + "index": 0, + "name": "Alarm ! Zero signal !", + "state_struct": "protect_1" + }, + { + "index":1, + "name": "Шток внизу !", + "state_struct": "protect_1" + }, + { + "index":2, + "name": "Шток вверху !", + "state_struct": "protect_1" + }, + { + "index": 3, + "name": "Uдуги > Uмакс !", + "state_struct": "protect_1" + }, + { + "index": 4, + "name": "Uдуги < Uмин !", + "state_struct": "protect_1" + }, + { + "index": 5, + "name": "Qводы кристаллизатора !", + "state_struct": "protect_1" + }, + { + "index": 6, + "name": "P2 воды кристаллизатора ЭКМ отметка -5м !", + "state_struct": "protect_1" + }, + { + "index": 7, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 8, + "name": "P1 воды кристаллизатора ЭКМ отметка +1.5м !", + "state_struct": "protect_1" + }, + { + "index": 9, + "name": "Вода штока !", + "state_struct": "protect_1" + }, + { + "index":10, + "name": "tводы штока !", + "state_struct": "protect_1" + }, + { + "index":11, + "name": "Вода вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":12, + "name": "tводы вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index":13, + "name": "Ухудшение вакуума !", + "state_struct": "protect_1" + }, + { + "index": 14, + "name": "Нет готовности к токовой операции!", + "state_struct": "protect_1" + }, + { + "index": 15, + "name": "Дверь А открыта !", + "state_struct": "protect_1" + }, + { + "index": 16, + "name": "Дверь Б открыта !", + "state_struct": "protect_1" + }, + { + "index": 17, + "name": "Дверь В открыта !", + "state_struct": "protect_1" + }, + { + "index": 18, + "name": "Дверь Г открыта !", + "state_struct": "protect_1" + }, + { + "index": 19, + "name": "Дверь Д открыта !", + "state_struct": "protect_1" + }, + { + "index": 20, + "name": "Прижимы !", + "state_struct": "protect_1" + }, + { + "index": 21, + "name": "Упоры !", + "state_struct": "protect_1" + }, + { + "index": 22, + "name": "Люк открыт !", + "state_struct": "protect_1" + }, + { + "index": 23, + "name": "Пенал открыт !", + "state_struct": "protect_1" + }, + { + "index": 24, + "name": "Вода подставки !", + "state_struct": "protect_1" + }, + { + "index": 25, + "name": "Нет U аварийной сигнализации !", + "state_struct": "protect_1" + }, + { + "index": 26, + "name": "Плохой вакуум !", + "state_struct": "protect_1" + }, + { + "index": 27, + "name": "tводы подставки !", + "state_struct": "protect_1" + }, + { + "index": 28, + "name": "Давление газа в печи выше атмосферного !", + "state_struct": "protect_1" + }, + { + "index": 29, + "name": "Вода фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 30, + "name": "Отключение ВВ!", + "state_struct": "protect_1" + }, + { + "index": 31, + "name": "tводы фланца вакуум-камеры !", + "state_struct": "protect_1" + }, + { + "index": 32, + "name": "P воды поддона !", + "state_struct": "protect_1" + }, + { + "index": 33, + "name": "Отсутствует связь с сервером 1 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 34, + "name": "Отсутствует связь с сервером 2 %s!*3", + "state_struct": "protect_1" + }, + { + "index": 35, + "name": "Отсутствует связь с контроллером ГМП !", + "state_struct": "protect_1" + }, + { + "index": 36, + "name": "Неисправность в работе ARPW !", + "state_struct": "protect_1" + }, + { + "index": 37, + "name": "Неисправность в работе ДВН !", + "state_struct": "protect_1" + }, + { + "index": 38, + "name": "Неисправность в работе ВВ !", + "state_struct": "protect_1" + }, + { + "index": 39, + "name": "Неисправность в работе ДУ-260 !", + "state_struct": "protect_1" + }, + { + "index": 40, + "name": "Неисправность в работе ДУ-100 !", + "state_struct": "protect_1" + }, + { + "index": 41, + "name": "Неисправность в работе ДУ-32 !", + "state_struct": "protect_1" + }, + { + "index": 43, + "name": "Неисправность в работе БПС !", + "state_struct": "protect_1" + }, + { + "index": 44, + "name": "Неисправность в режиме работы соленоида !", + "state_struct": "protect_1" + }, + { + "index": 45, + "name": "Нет питания сети !", + "state_struct": "protect_1" + }, + { + "index": 46, + "name": "КВ рамы", + "state_struct": "protect_1" + }, + { + "index": 48, + "name": "Нет сигнала датчика (МЕТРАН отм.+1.5м) !", + "state_struct": "protect_1" + }, + { + "index": 49, + "name": "БПС ГМП отключен!", + "state_struct": "protect_1" + }, + { + "index": 50, + "name": "Неисправность источника питания ВДП !", + "state_struct": "protect_1" + }, + { + "index": 51, + "name": "Нет принимаемых данных !", + "state_struct": "protect_1" + }, + { + "index": 52, + "name": "Разрыв дуги !", + "state_struct": "protect_1" + }, + { + "index": 53, + "name": "Нет готовности привода!", + "state_struct": "protect_1" + }, + { + "index": 54, + "name": "Alarm ! Signal A1_22 is set.", + "state_struct": "protect_1" + }, + { + "index": 55, + "name": "Короткое замыкание !", + "state_struct": "protect_1" + }, + { + "index": 56, + "name": "Переключатель УП не в положении АВТ !", + "state_struct": "protect_1" + }, + { + "index": 57, + "name": "Проверить перевод разьединителей печей!", + "state_struct": "protect_1" + }, + { + "index": 58, + "name": "Снижение протока воды штока!", + "state_struct": "protect_1" + }, + { + "index": 59, + "name": "Снижение протока воды камеры!", + "state_struct": "protect_1" + }, + { + "index": 60, + "name": "Снижение протока воды фланца!", + "state_struct": "protect_1" + }, + { + "index": 61, + "name": "Запрет зажигания дуги по времени вакуумирования!", + "state_struct": "protect_1" + }, + { + "index": 62, + "name": "Отсутствует ток соленоида !", + "state_struct": "protect_1" + }, + { + "index": 63, + "name": "Отсутствует перемещение штока !", + "state_struct": "protect_1" + }, + { + "index": 64, + "name": "Отсутствует перемещение штока > 15 минут!", + "state_struct": "protect_1" + }, + { + "index": 65, + "name": "Запрет на включение вакуумных насосов !", + "state_struct": "protect_1" + }, + { + "index": 67, + "name": "ВДП развакуумирована !", + "state_struct": "protect_1" + }, + { + "index": 70, + "name": "Смещение начала архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 71, + "name": "Смещение конца архивации %s !*1", + "state_struct": "protect_1" + }, + { + "index": 74, + "name": "", + "state_struct": "protect_1" + }, + { + "index": 75, + "name": "Alarm ! Signal A1_43 is set.", + "state_struct": "protect_1" + }, + { + "index": 76, + "name": "Alarm ! Signal A1_44 is set.", + "state_struct": "protect_1" + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/StateStruct.json b/ApiServer/bin/Release/net5.0/Config/StateStruct.json new file mode 100644 index 0000000..557fa01 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/StateStruct.json @@ -0,0 +1,265 @@ +{ + "protect_1": [ + { + "index": 0, + "name": "Отсутствует", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Сработало", + "color": "#ffff00" + }, + { + "index": 2, + "name": "Сброс тока", + "color": "#ff0000" + } + ], + "no_yes_err": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#ff0000" + } + ], + "no_yes_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "no_yes": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Да", + "color": "#00ff00" + } + ], + "have_no_err": [ + { + "index": 0, + "name": "Есть", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Нет", + "color": "#ff0000" + } + ], + "no_have_ok": [ + { + "index": 0, + "name": "Нет", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "no_have": [ + { + "index": 0, + "name": "Нет", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Есть", + "color": "#00ff00" + } + ], + "off_on_err": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#ff0000" + } + ], + "off_on": [ + { + "index": 0, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + } + ], + "open_close_ok": [ + { + "index": 0, + "name": "Откр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Закр", + "color": "#00ff00" + } + ], + "close_open_ok": [ + { + "index": 0, + "name": "Закр", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + } + ], + + "out_in_ok": [ + { + "index": 0, + "name": "Не введ", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Введ", + "color": "#00ff00" + } + ], + "spinn_clamp_ok": [ + { + "index": 0, + "name": "Отж", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Приж", + "color": "#00ff00" + } + ], + "spinn_press": [ + { + "index": 0, + "name": "Отж", + "color": "#00ff00" + }, + { + "index": 1, + "name": "Наж", + "color": "#00ff00" + } + ], + "none_on_off_err_3_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#ff0000" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_on_off_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Вкл", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Выкл", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ], + "none_err_const_puls_1_2": [ + { + "index": 0, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 1, + "name": "Авария", + "color": "#ff0000" + }, + { + "index": 2, + "name": "Пост", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Пульс", + "color": "#00ff00" + } + ], + "none_open_close_err_4": [ + { + "index": 0, + "name": "Неопр", + "color": "#ffffff" + }, + { + "index": 1, + "name": "Откр", + "color": "#00ff00" + }, + { + "index": 2, + "name": "Закр", + "color": "#00ff00" + }, + { + "index": 3, + "name": "Авария", + "color": "#ff0000" + } + ] + +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/TechCycle.json b/ApiServer/bin/Release/net5.0/Config/TechCycle.json new file mode 100644 index 0000000..715756d --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/TechCycle.json @@ -0,0 +1,94 @@ +{ + "tech_cycle_conf": [ + { + "index": -1, + "name": "Конец технологического цикла (ручной)", + "color": "#00ffff" + }, + { + "index": 0, + "name": "Конец технологического цикла", + "color": "#00ffff" + }, + { + "index": 1, + "name": "Выгрузка-загрузка", + "color": "#00ffff" + }, + { + "index": 2, + "name": "Вакуумирование на приварку", + "color": "#0000ff" + }, + { + "index": 5, + "name": "Приварка", + "color": "#ff0000" + }, + { + "index": 6, + "name": "Охлаждение приварки", + "color": "#00ff00" + }, + { + "index": 7, + "name": "Осмотр приварки", + "color": "#00ffff" + }, + { + "index": 8, + "name": "Вакуумирование на плавку", + "color": "#0000ff" + }, + { + "index": 9, + "name": "Разведение ванны", + "color": "#8500b6" + }, + { + "index": 10, + "name": "Плавка (основной режим)", + "color": "#ff0000" + }, + { + "index": 11, + "name": "ВУР", + "color": "#ff00ff" + }, + { + "index": 12, + "name": "Охлаждение слитка", + "color": "#00ff00" + }, + { + "index": 13, + "name": "Выгрузка комплекта", + "color": "#00ffff" + }, + { + "index": 14, + "name": "Вакуумирование на оплавление", + "color": "#0000ff" + }, + { + "index": 15, + "name": "Оплавление", + "color": "#ff0000" + }, + { + "index": 16, + "name": "Охлаждение оплавыша", + "color": "#00ff00" + }, + { + "index": 17, + "name": "Слив металла", + "color": "#8500b6" + }, + { + "index": 25, + "name": "Проверка защит", + "color": "#00ffff" + } + ] +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/analog/all.json b/ApiServer/bin/Release/net5.0/Config/analog/all.json new file mode 100644 index 0000000..d8b8000 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/analog/all.json @@ -0,0 +1,56 @@ +{ + "01": { "parent": [ "default" ] }, + "02": { "parent": [ "default" ] }, + "03": { "parent": [ "default" ] }, + "04": { "parent": [ "default" ] }, + "05": { "parent": [ "default" ] }, + "06": { "parent": [ "default" ] }, + "07": { "parent": [ "default" ] }, + "08": { "parent": [ "default" ] }, + "09": { "parent": [ "default" ] }, + "10": { "parent": [ "default" ] }, + "11": { "parent": [ "default" ] }, + "12": { "parent": [ "default" ] }, + "13": { "parent": [ "default" ] }, + "14": { "parent": [ "default" ] }, + "15": { "parent": [ "default" ] }, + "16": { "parent": [ "default" ] }, + "17": { "parent": [ "default" ] }, + "18": { "parent": [ "default" ] }, + "19": { "parent": [ "default" ] }, + "20": { "parent": [ "default" ] }, + "21": { "parent": [ "default" ] }, + "22": { "parent": [ "default" ] }, + "23": { "parent": [ "default" ] }, + "24": { "parent": [ "default" ] }, + "25": { "parent": [ "default" ] }, + "26": { "parent": [ "default" ] }, + "27": { "parent": [ "default" ] }, + "28": { "parent": [ "default" ] }, + "29": { "parent": [ "default" ] }, + "30": { "parent": [ "default" ] }, + "31": { "parent": [ "default" ] }, + "32": { "parent": [ "default" ] }, + "33": { "parent": [ "default" ] }, + "34": { "parent": [ "default" ] }, + "35": { "parent": [ "default" ] }, + "36": { "parent": [ "default" ] }, + "37": { "parent": [ "default" ] }, + "38": { "parent": [ "default" ] }, + "39": { "parent": [ "default" ] }, + "40": { "parent": [ "default" ] }, + "41": { "parent": [ "default" ] }, + "42": { "parent": [ "default" ] }, + "43": { "parent": [ "default" ] }, + "44": { "parent": [ "default" ] }, + "45": { "parent": [ "default" ] }, + "46": { "parent": [ "default" ] }, + "47": { "parent": [ "default" ] }, + "48": { "parent": [ "default" ] }, + "49": { "parent": [ "default" ] }, + "50": { "parent": [ "default" ] }, + "91": { "parent": [ "default" ] }, + "92": { "parent": [ "default" ] }, + "93": { "parent": [ "default" ] }, + "94": { "parent": [ "default" ] } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/analog/default.json b/ApiServer/bin/Release/net5.0/Config/analog/default.json index d096f0e..0fbd4bc 100644 --- a/ApiServer/bin/Release/net5.0/Config/analog/default.json +++ b/ApiServer/bin/Release/net5.0/Config/analog/default.json @@ -1,368 +1,380 @@ { - "deleteAll": true, - "delete": [], - "add": [ - { - "id": 0, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [ 0, 1 ] - }, - { - "id": 1, - "name": " ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [ 2, 3 ] - }, - { - "id": 2, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [4,5] - }, - { - "id": 3, - "name": "U ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [6,7] - }, - { - "id": 4, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [8,9] - }, - { - "id": 5, - "name": "U ", - "sname": "U ", - "measure": "", - "mul": 0.1, - "byteId": [10,11] - }, - { - "id": 6, - "name": " ", - "sname": "I ", - "measure": "", - "mul": 0.1, - "byteId": [12,13] - }, - { - "id": 7, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [14,15] - }, - { - "id": 8, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [16,17] - }, - { - "id": 9, - "name": "t -", - "sname": "t -", - "measure": ".", - "byteId": [18,19] - }, - { - "id": 10, - "name": "t ", - "sname": "t ", - "measure": ".", - "byteId": [20,21] - }, - { - "id": 11, - "name": " 0.1", - "sname": "S ", - "measure": "", - "mul": 0.1, - "byteId": [22,23] - }, - { - "id": 12, - "name": "", - "sname": "S ", - "measure": "", - "byteId": [24,25] - }, - { - "id": 13, - "name": " ", - "measure": "..", - "mul": -1, - "byteId": [26,27] - }, - { - "id": 14, - "name": " -", - "sname": "R -", - "measure": "", - "mul": 0.1, - "byteId": [28,29] - }, - { - "id": 15, - "name": " -", - "sname": "R -", - "measure": "", - "mul": 0.1, - "byteId": [30,31] - }, - { - "id": 16, - "name": " ", - "sname": "Q .", - "measure": "^3/", - "byteId": [ 32, 33 ] - }, - { - "id": 17, - "name": " ", - "sname": "..", - "mul": 0.01, - "byteId": [34,35] - }, - { - "id": 18, - "name": " ", - "sname": "..", - "mul": 0.1, - "byteId": [36,37] - }, - { - "id": 19, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [38,39] - }, - { - "id": 20, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [40,41] - }, - { - "id": 21, - "name": " .+1,5", - "sname": "P .", - "measure": "/^2", - "mul": 0.01, - "byteId": [42,43] - }, - { - "id": 22, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [44,45] - }, - { - "id": 23, - "name": " ()", - "sname": "I . ", - "measure": "", - "mul": 0.1, - "byteId": [58,59] - }, - { - "id": 25, - "name": "-. ", - "sname": "-", - "measure": "", - "mul": 0.1, - "byteId": [62,63] - }, - { - "id": 26, - "name": "-. . ", - "sname": "-", - "measure": "", - "mul": 0.1, - "byteId": [64,65] - }, - { - "id": 27, - "name": "t -", - "sname": "t .", - "measure": ".", - "byteId": [66,67] - }, - { - "id": 28, - "name": "t ", - "sname": "t .", - "measure": ".", - "byteId": [68,69] - }, - { - "id": 29, - "name": " ", - "sname": "Q. .", - "measure": "^3/", - "mul": 0.01, - "byteId": [70,71] - }, - { - "id": 30, - "name": " ", - "sname": ". .", - "measure": "", - "mul": 0.1, - "byteId": [72,73] - }, - { - "id": 31, - "name": " (.)", - "sname": "I .. .", - "measure": "", - "mul": 0.1, - "byteId": [74,75] - }, - { - "id": 33, - "name": " -1200", - "sname": "-1200", - "measure": "..", - "mul": 0.1, - "byteId": [78,79] - }, - { - "id": 34, - "name": " -18,75", - "sname": "-18,25", - "measure": "..", - "mul": 0.001, - "byteId": [80,81] - }, - { - "id": 35, - "name": " ", - "sname": "P ..", - "measure": "/^2", - "mul": 0.1, - "byteId": [82,83] - }, - { - "id": 36, - "name": " ", - "sname": "P ..", - "measure": "/^2", - "byteId": [84,85] - }, - { - "id": 37, - "name": " ()", - "sname": ".I, ", - "measure": "", - "mul": 0.1, - "byteId": [86,87] - }, - { - "id": 38, - "name": " ", - "sname": "...", - "measure": "", - "mul": 0.01, - "byteId": [88,89] - }, - { - "id": 39, - "name": " ARPW", - "sname": "I . ARPW", - "measure": "", - "mul": 0.01, - "byteId": [90,91] - }, - { - "id": 40, - "name": " ", - "sname": "., ", - "measure": "", - "mul": 0.1, - "byteId": [] - }, - { - "id": 41, - "name": " . 1 .", - "sname": "U . 1, ", - "measure": "", - "mul": 0.1, - "byteId": [92,93] - }, - { - "id": 42, - "name": ": 1", - "sname": "I 1 ", - "measure": "", - "byteId": [94,95] - }, - { - "id": 43, - "name": ": 2", - "sname": "I 2 ", - "measure": "", - "byteId": [96,97] - }, - { - "id": 44, - "name": ": 3", - "sname": "I 3 ", - "measure": "", - "byteId": [98,99] - }, - { - "id": 45, - "name": ": ", - "sname": ". ", - "measure": "", - "mul": 0.1, - "byteId": [100,101] - }, - { - "id": 46, - "name": ": p", - "mul": 0.01, - "byteId": [102,103] - }, - { - "id": 47, - "name": ": i", - "mul": 0.01, - "byteId": [104,105] - }, - { - "id": 49, - "name": " ", - "byteId": [106,107] - }, - { - "id": 50, - "name": " U ", - "measure": "", - "mul": 0.1, - "byteId": [108,109] - } - - ] -} + "default": { + "struct": [ + { + "index": 0, + "name": "Ток дуги", + "s_name": "I д", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 0, 1 ] + }, + { + "index": 1, + "name": "Напряжение дуги", + "s_name": "U д", + "metric": "В", + "mul": 0.1, + "show_default": true, + "bytes": [ 2, 3 ] + }, + { + "index": 2, + "name": "Ток рабочего двигателя", + "s_name": "I рд", + "metric": "А", + "mul": 0.1, + "bytes": [ 4, 5 ] + }, + { + "index": 3, + "name": "U рабочего двигателя", + "s_name": "U рд", + "metric": "В", + "mul": 0.1, + "bytes": [ 6, 7 ] + }, + { + "index": 4, + "name": "Ток соленоида", + "s_name": "I сол", + "metric": "А", + "mul": 0.1, + "bytes": [ 8, 9 ] + }, + { + "index": 5, + "name": "U соленоида", + "s_name": "U сол", + "metric": "В", + "mul": 0.1, + "bytes": [ 10, 11 ] + }, + { + "index": 6, + "name": "Ток задания", + "s_name": "I рз", + "metric": "кА", + "mul": 0.1, + "show_default": true, + "bytes": [ 12, 13 ] + }, + { + "index": 7, + "name": "t кристаллизатора на входе", + "s_name": "t кр.вых", + "metric": "гр.С", + "mul": 1, + "bytes": [ 14, 15 ] + }, + { + "index": 8, + "name": "t кристаллизатора на выходе", + "s_name": "t кр.вх", + "metric": "гр.С", + "mul": 1, + "bytes": [ 16, 17 ] + }, + { + "index": 9, + "name": "t вакуум-камеры", + "s_name": "t вак-кам", + "metric": "гр.С", + "mul": 1, + "bytes": [ 18, 19 ] + }, + { + "index": 10, + "name": "t штока", + "s_name": "t шт", + "metric": "гр.С", + "mul": 1, + "bytes": [ 20, 21 ] + }, + { + "index": 11, + "name": "U контроля", + "s_name": "U конт", + "metric": "В", + "mul": 0.1, + "bytes": [ 22, 23 ] + }, + { + "index": 12, + "name": "Перемещение", + "s_name": "S шт", + "metric": "мм", + "mul": 1, + "bytes": [ 24, 25 ] + }, + { + "index": 13, + "name": "Вакуум", + "s_name": "Вакуум", + "metric": "мкм.рт.ст", + "mul": -1, + "show_default": true, + "bytes": [ 26, 27 ] + }, + { + "index": 14, + "name": "Изоляция шток-крышка", + "s_name": "R шт-кр", + "metric": "В", + "mul": 0.1, + "bytes": [ 28, 29 ] + }, + { + "index": 15, + "name": "Изоляция крышка-камера", + "s_name": "R кр-кам", + "metric": "В", + "mul": 0.1, + "bytes": [ 30, 31 ] + }, + { + "index": 16, + "name": "Расход воды", + "s_name": "Q в.кр", + "metric": "м^3/ч", + "mul": 1, + "bytes": [ 32, 33 ] + }, + { + "index": 17, + "name": "Капельные замыкания", + "s_name": "Кап.зам.", + "metric": "УЕ", + "mul": 0.01, + "bytes": [ 34, 35 ] + }, + { + "index": 18, + "name": "Усреднённая ширина импульсов КЗ", + "s_name": "Кап.зым.", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 36, 37 ] + }, + { + "index": 19, + "name": "Проток воды фланца", + "s_name": "Qв. фл.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 38, 39 ] + }, + { + "index": 20, + "name": "Проток воды штока", + "s_name": "Qв. шт.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 40, 41 ] + }, + { + "index": 21, + "name": "Давление воды крист.+1,5", + "s_name": "P в.кр", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [ 42, 43 ] + }, + { + "index": 22, + "name": "Проток воды камеры", + "s_name": "Qв. кам.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 44, 45 ] + }, + { + "index": 23, + "name": "Ток задания источника(САУ)", + "s_name": "I з.ист САУ", + "metric": "кА", + "mul": 0.1, + "bytes": [ 58, 59 ] + }, + { + "index": 24, + "name": "", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 60, 61 ] + }, + { + "index": 25, + "name": "ПИД-рег. основная уставка", + "s_name": "ПИД-осн", + "metric": "В", + "mul": 0.1, + "bytes": [ 62, 63 ] + }, + { + "index": 26, + "name": "ПИД-рег. макс. скорость", + "s_name": "ПИД-макс", + "metric": "В", + "mul": 0.1, + "bytes": [ 64, 65 ] + }, + { + "index": 27, + "name": "t фланца вакуум-камеры", + "s_name": "t фл.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 66, 67 ] + }, + { + "index": 28, + "name": "t подставки", + "s_name": "t под.", + "metric": "гр.С", + "mul": 1, + "bytes": [ 68, 69 ] + }, + { + "index": 29, + "name": "Проток воды подставки", + "s_name": "Qв. под.", + "metric": "м^3/ч", + "mul": 0.01, + "bytes": [ 70, 71 ] + }, + { + "index": 30, + "name": "Задание соленоида", + "s_name": "Зад. сол.", + "metric": "А", + "mul": 0.1, + "bytes": [ 72, 73 ] + }, + { + "index": 31, + "name": "Ток задания источника(преобраз.)", + "s_name": "I з.ист. преоб.", + "metric": "кА", + "mul": 0.1, + "bytes": [ 74, 75 ] + }, + { + "index": 32, + "name": "Резерв", + "s_name": "", + "metric": "УЕ", + "mul": 0.1, + "bytes": [ 76, 77 ] + }, + { + "index": 33, + "name": "Вакуум по МЕТРАН-1200", + "s_name": "МЕТРАН-1200", + "metric": "мм.рт.ст", + "mul": 0.1, + "show_default": true, + "bytes": [ 78, 79 ] + }, + { + "index": 34, + "name": "Вакуум по МЕТРАН-18,75", + "s_name": "МЕТРАН-18,25", + "metric": "мм.рт.ст", + "mul": 0.001, + "show_default": true, + "bytes": [ 80, 81 ] + }, + { + "index": 35, + "name": "Давление газа в баллоне", + "s_name": "P г.балл.", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [ 82, 83 ] + }, + { + "index": 36, + "name": "Давление воды поддона", + "s_name": "P в.подд.", + "metric": "кгс/см^2", + "mul": 1, + "bytes": [ 84, 85 ] + }, + { + "index": 37, + "name": "Задание тока дуги (ЦАП)", + "s_name": "Зад.I, ЦАП", + "metric": "кА", + "mul": 0.1, + "bytes": [ 86, 87 ] + }, + { + "index": 38, + "name": "Задкние скорости рабочего двигателя", + "s_name": "Зад.ск.раб.дв", + "metric": "В", + "mul": 0.1, + "bytes": [ 88, 89 ] + }, + { + "index": 39, + "name": "Ток двигателя насоса ARPW", + "s_name": "I дв. ARPW", + "metric": "А", + "mul": 0.01, + "bytes": [ 90, 91 ] + }, + { + "index": 40, + "name": "Энергия плавильного пролёта", + "s_name": "Эн.пролёта, МВт", + "metric": "МВт", + "mul": 0.1, + "bytes": [ 92, 93 ] + }, + { + "index": 41, + "name": "Среднее напряжение плавления", + "s_name": "U средн, В", + "metric": "В", + "mul": 0.1, + "bytes": [ 94, 95 ] + }, + { + "index": 42, + "name": "ГМП: ток катушки 1", + "s_name": "I кат1 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 96, 97 ] + }, + { + "index": 43, + "name": "ГМП: ток катушки 2", + "s_name": "I кат2 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 98, 99 ] + }, + { + "index": 44, + "name": "ГМП: ток катушки 3", + "s_name": "I кат3 ГМП", + "metric": "А", + "mul": 1, + "bytes": [ 100, 101 ] + }, + { + "index": 45, + "name": "ГМП: частота", + "s_name": "Част. ГМП", + "metric": "Гц", + "mul": 1, + "bytes": [ 102, 103 ] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/analog/global.json b/ApiServer/bin/Release/net5.0/Config/analog/global.json new file mode 100644 index 0000000..f65ef99 --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/analog/global.json @@ -0,0 +1,110 @@ +{ + "00": { + "struct": [ + { + "index": 0, + "name": "Общий: t воды водооборота", + "s_name": "t в", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 1, + "name": "Общий: Давление воды водооборота", + "s_name": "P в", + "metric": "кгс/см^2", + "mul": 0.01, + "bytes": [] + }, + { + "index": 2, + "name": "Общий: Давление масла в бутыли", + "s_name": "P масла бут", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 3, + "name": "Общий: t воздуха в машинном зале", + "s_name": "t машзал", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 4, + "name": "Общий: t воздуха на улице", + "s_name": "t улица", + "metric": "гр.С", + "mul": 0.1, + "bytes": [] + }, + { + "index": 5, + "name": "Общий: Атмосферное давление", + "s_name": "p атм", + "metric": "мм.рт.ст", + "mul": 0.1, + "bytes": [] + }, + { + "index": 6, + "name": "Общий: Давление масла в магистрали", + "s_name": "P масла маг", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 7, + "name": "Общий: Давление воды водооборота-К90", + "s_name": "P в-90", + "metric": "кгс/см^2", + "mul": 0.1, + "bytes": [] + }, + { + "index": 8, + "name": "Скорость штока за 1 мин", + "s_name": "V шт", + "metric": "мм/мин", + "mul": 0.01, + "bytes": [] + }, + { + "index": 9, + "name": "Вакуум по МЕТРАН 1,2", + "s_name": "МЕТРАН1,2", + "metric": "мм.рт.ст", + "mul": 0.001, + "bytes": [] + }, + { + "index": 10, + "name": "ВС: Ток дуги", + "s_name": "ВС:I д", + "metric": "кА", + "mul": 0.1, + "bytes": [] + }, + { + "index": 12, + "name": "ВС: Напряжение дуги", + "s_name": "ВС:U д", + "metric": "В", + "mul": 0.1, + "bytes": [] + }, + { + "index": 13, + "name": "ВС: Ток задания", + "s_name": "ВС:I рз", + "metric": "кА", + "mul": 0.1, + "bytes": [] + } + ] + } +} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/Config/bufer.json b/ApiServer/bin/Release/net5.0/Config/bufer.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/ApiServer/bin/Release/net5.0/Config/bufer.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/DataClient.dll b/ApiServer/bin/Release/net5.0/DataClient.dll index 9be7a0c..5174fdb 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.dll and b/ApiServer/bin/Release/net5.0/DataClient.dll differ diff --git a/ApiServer/bin/Release/net5.0/DataClient.pdb b/ApiServer/bin/Release/net5.0/DataClient.pdb index fcafcb5..d1758de 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.pdb and b/ApiServer/bin/Release/net5.0/DataClient.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll b/ApiServer/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..8a74343 Binary files /dev/null and b/ApiServer/bin/Release/net5.0/ICSharpCode.SharpZipLib.dll differ diff --git a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll index bb49ba5..1b501fc 100644 Binary files a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/bin/Release/web.config b/ApiServer/bin/Release/web.config deleted file mode 100644 index cec8b43..0000000 --- a/ApiServer/bin/Release/web.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json b/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json index 5046b4d..bbba79a 100644 --- a/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json +++ b/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json @@ -57,6 +57,10 @@ "Newtonsoft.Json": { "target": "Package", "version": "[13.0.1, )" + }, + "SharpZipLib": { + "target": "Package", + "version": "[1.3.3, )" } }, "imports": [ @@ -77,7 +81,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -151,7 +155,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ApiServer/obj/ApiServer.csproj.nuget.g.props b/ApiServer/obj/ApiServer.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/ApiServer/obj/ApiServer.csproj.nuget.g.props +++ b/ApiServer/obj/ApiServer.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache b/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache index 7dd91e3..077a4ab 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache and b/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache differ diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache index 26dfd88..e3f6770 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache and b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache differ diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.CoreCompileInputs.cache b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.CoreCompileInputs.cache index 02e9c2d..87f6736 100644 --- a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.CoreCompileInputs.cache +++ b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eece26e2641288ea40de3e4121e24408575928d1 +5643e18af42acbd094b9a55b464ee34c70e33f4c diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.FileListAbsolute.txt b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.FileListAbsolute.txt index a274a95..434e6bd 100644 --- a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.FileListAbsolute.txt +++ b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.FileListAbsolute.txt @@ -30,3 +30,48 @@ D:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.dll D:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ref\ApiServer.dll D:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.pdb D:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\appsettings.Development.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\appsettings.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Colors.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Discret\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Discret\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Discret\power_new.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Protect\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Protect\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\StateStruct.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\TechCycle.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.exe +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\config.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.deps.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.runtimeconfig.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ref\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ApiServer.pdb +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\NLog.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\ICSharpCode.SharpZipLib.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\DataClient.xml +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.AssemblyInfo.cs +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.MvcApplicationPartsAssemblyInfo.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\staticwebassets\ApiServer.StaticWebAssets.Manifest.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\staticwebassets\ApiServer.StaticWebAssets.xml +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\scopedcss\bundle\ApiServer.styles.css +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.RazorTargetAssemblyInfo.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.csproj.CopyComplete +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ref\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.pdb +F:\GIT\ASCKU_PC\ApiServer\obj\Debug\net5.0\ApiServer.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Analog\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Analog\global.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\bufer.json +F:\GIT\ASCKU_PC\ApiServer\bin\Debug\net5.0\Config\Metrics.json diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.dll b/ApiServer/obj/Debug/net5.0/ApiServer.dll index 0f209cf..72fe2fb 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.dll and b/ApiServer/obj/Debug/net5.0/ApiServer.dll differ diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.genruntimeconfig.cache b/ApiServer/obj/Debug/net5.0/ApiServer.genruntimeconfig.cache index abb2a20..6016326 100644 --- a/ApiServer/obj/Debug/net5.0/ApiServer.genruntimeconfig.cache +++ b/ApiServer/obj/Debug/net5.0/ApiServer.genruntimeconfig.cache @@ -1 +1 @@ -0a8c2f7fcebea58b73a53bb1c0a2aa1056202aba +b0f840db997650a7593b11f7a1ba44023edfe205 diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.pdb b/ApiServer/obj/Debug/net5.0/ApiServer.pdb index 14663bd..f1127df 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.pdb and b/ApiServer/obj/Debug/net5.0/ApiServer.pdb differ diff --git a/ApiServer/obj/Debug/net5.0/apphost.exe b/ApiServer/obj/Debug/net5.0/apphost.exe index b796af4..055a749 100644 Binary files a/ApiServer/obj/Debug/net5.0/apphost.exe and b/ApiServer/obj/Debug/net5.0/apphost.exe differ diff --git a/ApiServer/obj/Debug/net5.0/ref/ApiServer.dll b/ApiServer/obj/Debug/net5.0/ref/ApiServer.dll index 34fd394..9c7df0d 100644 Binary files a/ApiServer/obj/Debug/net5.0/ref/ApiServer.dll and b/ApiServer/obj/Debug/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.GeneratedMSBuildEditorConfig.editorconfig b/ApiServer/obj/Release/net5.0/ApiServer.GeneratedMSBuildEditorConfig.editorconfig index 3872ac0..e95139d 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.GeneratedMSBuildEditorConfig.editorconfig +++ b/ApiServer/obj/Release/net5.0/ApiServer.GeneratedMSBuildEditorConfig.editorconfig @@ -3,6 +3,8 @@ build_property.TargetFramework = net5.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = true build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = ApiServer +build_property.ProjectDir = F:\GIT\ASCKU_PC\ApiServer\ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.assets.cache b/ApiServer/obj/Release/net5.0/ApiServer.assets.cache index dadf5b7..1326bc0 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.assets.cache and b/ApiServer/obj/Release/net5.0/ApiServer.assets.cache differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache index 3153dd0..e989deb 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache and b/ApiServer/obj/Release/net5.0/ApiServer.csproj.AssemblyReference.cache differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache index 02713a0..9b6738d 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache +++ b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0ba5eb43d3c8baaf93d0a30f42372f5107b7f4d6 +88c3d457dcfd042e813af84ecc14463dd72fdce9 diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt b/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt index 8335b3f..5623e63 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt +++ b/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt @@ -60,3 +60,16 @@ F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.dll F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Colors.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ICSharpCode.SharpZipLib.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\TechCycle.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Protect\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Protect\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\StateStruct.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Discret\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Discret\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Discret\power_new.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Analog\all.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Analog\global.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\bufer.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\Metrics.json diff --git a/ApiServer/obj/Release/net5.0/ApiServer.dll b/ApiServer/obj/Release/net5.0/ApiServer.dll index dcb3aaa..6e336e3 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.pdb b/ApiServer/obj/Release/net5.0/ApiServer.pdb index a90cc52..be8a1e7 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.pdb and b/ApiServer/obj/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/obj/Release/net5.0/apphost.exe b/ApiServer/obj/Release/net5.0/apphost.exe index b796af4..fa670f1 100644 Binary files a/ApiServer/obj/Release/net5.0/apphost.exe and b/ApiServer/obj/Release/net5.0/apphost.exe differ diff --git a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll index bb49ba5..1b501fc 100644 Binary files a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/obj/project.assets.json b/ApiServer/obj/project.assets.json index 56b624c..1f5ee1b 100644 --- a/ApiServer/obj/project.assets.json +++ b/ApiServer/obj/project.assets.json @@ -113,6 +113,15 @@ "lib/net5.0/NLog.Extensions.Logging.dll": {} } }, + "SharpZipLib/1.3.3": { + "type": "package", + "compile": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {} + }, + "runtime": { + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll": {} + } + }, "DataClient/0.0.3": { "type": "project", "framework": ".NETCoreApp,Version=v5.0", @@ -367,6 +376,27 @@ "nlog.extensions.logging.nuspec" ] }, + "SharpZipLib/1.3.3": { + "sha512": "N8+hwhsKZm25tDJfWpBSW7EGhH/R7EMuiX+KJ4C4u+fCWVc1lJ5zg1u3S1RPPVYgTqhx/C3hxrqUpi6RwK5+Tg==", + "type": "package", + "path": "sharpziplib/1.3.3", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "images/sharpziplib-nuget-256x256.png", + "lib/net45/ICSharpCode.SharpZipLib.dll", + "lib/net45/ICSharpCode.SharpZipLib.pdb", + "lib/net45/ICSharpCode.SharpZipLib.xml", + "lib/netstandard2.0/ICSharpCode.SharpZipLib.dll", + "lib/netstandard2.0/ICSharpCode.SharpZipLib.pdb", + "lib/netstandard2.0/ICSharpCode.SharpZipLib.xml", + "lib/netstandard2.1/ICSharpCode.SharpZipLib.dll", + "lib/netstandard2.1/ICSharpCode.SharpZipLib.pdb", + "lib/netstandard2.1/ICSharpCode.SharpZipLib.xml", + "sharpziplib.1.3.3.nupkg.sha512", + "sharpziplib.nuspec" + ] + }, "DataClient/0.0.3": { "type": "project", "path": "../DataClient/DataClient.csproj", @@ -377,7 +407,8 @@ "net5.0": [ "DataClient >= 0.0.3", "NLog >= 4.7.10", - "Newtonsoft.Json >= 13.0.1" + "Newtonsoft.Json >= 13.0.1", + "SharpZipLib >= 1.3.3" ] }, "packageFolders": { @@ -438,6 +469,10 @@ "Newtonsoft.Json": { "target": "Package", "version": "[13.0.1, )" + }, + "SharpZipLib": { + "target": "Package", + "version": "[1.3.3, )" } }, "imports": [ @@ -458,7 +493,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ApiServer/obj/project.nuget.cache b/ApiServer/obj/project.nuget.cache index e419834..7393d9c 100644 --- a/ApiServer/obj/project.nuget.cache +++ b/ApiServer/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "c7G+nOZ81H331zux09OXgbP7HT0d7L0fH0RWR7PzDQiuRE4M8wC0X3SJ0DcA3WX51Fx127vns1AXmLvzg6K8jQ==", + "dgSpecHash": "P9v12PYMiQFKVhIxx0e6hjTNK0xTZNkQWp1k6N0qDSA6sdBN/y+QU1+SWxLaDs7vHtY/TWrkfHiQmc2O7VeioQ==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", "expectedPackageFiles": [ @@ -13,7 +13,8 @@ "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", "C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" + "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512", + "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.3.3\\sharpziplib.1.3.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ClientCollector.dll index ca85ddd..d818200 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.dll and b/ClientCollector/bin/Release/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.exe b/ClientCollector/bin/Release/net5.0/ClientCollector.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.exe and b/ClientCollector/bin/Release/net5.0/ClientCollector.exe differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb index 6a75ef4..98df9cb 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb and b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json b/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json index ea4326b..cb610d9 100644 --- a/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json +++ b/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json @@ -1,11 +1,10 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\google\\.nuget\\packages", + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" ] } } \ No newline at end of file diff --git a/ClientCollector/bin/Release/net5.0/DataClient.dll b/ClientCollector/bin/Release/net5.0/DataClient.dll index 8ff74d9..5174fdb 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.dll and b/ClientCollector/bin/Release/net5.0/DataClient.dll differ diff --git a/ClientCollector/bin/Release/net5.0/DataClient.pdb b/ClientCollector/bin/Release/net5.0/DataClient.pdb index fe89768..d1758de 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.pdb and b/ClientCollector/bin/Release/net5.0/DataClient.pdb differ diff --git a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json index 1a36f6b..dd46099 100644 --- a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json +++ b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json @@ -78,7 +78,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -152,7 +152,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ClientCollector/obj/ClientCollector.csproj.nuget.g.props b/ClientCollector/obj/ClientCollector.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/ClientCollector/obj/ClientCollector.csproj.nuget.g.props +++ b/ClientCollector/obj/ClientCollector.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache index 49ccda3..a1572d6 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache and b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.GeneratedMSBuildEditorConfig.editorconfig b/ClientCollector/obj/Release/net5.0/ClientCollector.GeneratedMSBuildEditorConfig.editorconfig index d7e2983..6bbc6b3 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.GeneratedMSBuildEditorConfig.editorconfig +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.GeneratedMSBuildEditorConfig.editorconfig @@ -3,6 +3,8 @@ build_property.TargetFramework = net5.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = ClientCollector +build_property.ProjectDir = F:\GIT\ASCKU_PC\ClientCollector\ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache index f1f98c1..38995e9 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache and b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.AssemblyReference.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.AssemblyReference.cache index dda83cb..41144bc 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.AssemblyReference.cache and b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.AssemblyReference.cache differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache index 3d27c44..ed506d6 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b8ef049e49398d7019ddc75458087be327b62a97 +0ddf11f8d882d41c386d6579880f8224eb1b92a3 diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt index b7e3a4c..96b0e19 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt @@ -61,3 +61,4 @@ F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache D:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ICSharpCode.SharpZipLib.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ICSharpCode.SharpZipLib.dll diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ClientCollector.dll index ca85ddd..d818200 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.dll and b/ClientCollector/obj/Release/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache index e06a85e..abc5d0f 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache @@ -1 +1 @@ -3059e59609f09ef6cd06323054f8ca266f28c046 +846560ec7c1e16455a5ab89cc5fed101f9ef4aea diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb index 6a75ef4..98df9cb 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb and b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/obj/Release/net5.0/apphost.exe b/ClientCollector/obj/Release/net5.0/apphost.exe index 579b8cc..d0c9975 100644 Binary files a/ClientCollector/obj/Release/net5.0/apphost.exe and b/ClientCollector/obj/Release/net5.0/apphost.exe differ diff --git a/ClientCollector/obj/project.assets.json b/ClientCollector/obj/project.assets.json index e28ac3a..e815aff 100644 --- a/ClientCollector/obj/project.assets.json +++ b/ClientCollector/obj/project.assets.json @@ -490,7 +490,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ClientCollector/obj/project.nuget.cache b/ClientCollector/obj/project.nuget.cache index 6b4c47a..204b019 100644 --- a/ClientCollector/obj/project.nuget.cache +++ b/ClientCollector/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "z0XxiEFHjjZdyGbQNmtO/rlHCWqDApEdxrwSd4tdkMY+UAuAK1x1lBhXuQpTQpLpSzoOBfvu7oP7zwKNJV9F6A==", + "dgSpecHash": "nEPcLFCjTRiLs/iErnbStWpYO57FLAIjZcIQ1huHyOSjp9nicPoGQIYW8ttyUA/orWX4XqlX+90VY6/6Coy8qw==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", "expectedPackageFiles": [ diff --git a/DataClient/ByteConverter.cs b/DataClient/ByteConverter.cs index 5fa43a0..7dd4438 100644 --- a/DataClient/ByteConverter.cs +++ b/DataClient/ByteConverter.cs @@ -45,8 +45,8 @@ namespace DataClient { case 0: var idxStr = enc.GetString(str.ToArray()); - if (idxStr == "00") res.Operation = TechCycle.Oper.end_cycle_manual; - else if (int.TryParse(idxStr, out int idx)) res.index = (sbyte?)idx; + if (idxStr == "00") res.Index = -1; + else if (int.TryParse(idxStr, out int idx)) res.Index = (sbyte?)idx; str.Clear(); flag++; break; @@ -63,7 +63,7 @@ namespace DataClient if (flag != 2) throw exc; var unixTimeStr = enc.GetString(str.ToArray()); if (!int.TryParse(unixTimeStr, out int unixTime)) throw exc; - res.start = (new DateTime(1970, 1, 1, 0, 0, 0, 0)).AddSeconds(unixTime).ToLocalTime(); + res.StartDateTime = (new DateTime(1970, 1, 1, 0, 0, 0, 0)).AddSeconds(unixTime).ToLocalTime(); return res; } catch { throw; } diff --git a/DataClient/ClassDiagram1.cd b/DataClient/ClassDiagram1.cd index d55f8f9..4db9aac 100644 --- a/DataClient/ClassDiagram1.cd +++ b/DataClient/ClassDiagram1.cd @@ -1,70 +1,11 @@  - - - - - - - NETClient.cs - - - - - QgIAADAGAQAAQAAQAAAAiIAACDICAogQAAEkAECAISE= - NETClient.cs - - - - - - AgAAAIAAAEAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAA= - ByteConverter.cs - - + - + AgEDgEYgABADIBQMAAAhAoARAAIACCAAgAAQBDAQAgI= Struct\Pasport.cs - - - - - - - - - Struct\Struct.cs - - - - - AAAAAAAAAAAAAAAAAIAAAAAAAAAAAgAAACAAAAAAAAA= - Struct\Struct.cs - - - - - - - - Struct\TechCycle.cs - - - - - AAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAEAAAABAAA= - Struct\TechCycle.cs - - - - - - AAAAAAAAACAAAAAAAAAAAAAAAAAEAAgAAAAgAAAAAAA= - Struct\Struct.cs - - \ No newline at end of file diff --git a/DataClient/ClassDiagram2.cd b/DataClient/ClassDiagram2.cd new file mode 100644 index 0000000..a586d7e --- /dev/null +++ b/DataClient/ClassDiagram2.cd @@ -0,0 +1,67 @@ + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAQAAAAA= + Struct\Analog.cs + + + + + + AAgAEAABAAAQEAAAAAABAAAAAAAEAAAAAgAAAIAAAgA= + Struct\Analog.cs + + + + + + AgEDgEYgABADIBQMAAAhAoARAAIACCAAgAAQBDAQAgI= + Struct\Pasport.cs + + + + + + AAAAAAAAAAAAAAAAAIAAAAAAAAAAAgAAACAAAAAAAAA= + Struct\Struct.cs + + + + + + AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + Struct\TechCycle.cs + + + + + + AAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAAAAAA= + Struct\TechCycleParams.cs + + + + + + AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + Struct\TechCycles.cs + + + + + + AgAAAIAAAEAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAA= + ByteConverter.cs + + + + + + AAAAAAAAACAAAAAAAAAAAAAAAAAEAAgAAAAgAAAAAAA= + Struct\Struct.cs + + + + \ No newline at end of file diff --git a/DataClient/ClassDiagram3.cd b/DataClient/ClassDiagram3.cd new file mode 100644 index 0000000..2d0560d --- /dev/null +++ b/DataClient/ClassDiagram3.cd @@ -0,0 +1,18 @@ + + + + + + + + NETClient.cs + + + + + RgIAADAGAQAAQAAQAAAAiIAACDICAogQAAEkAECAISE= + NETClient.cs + + + + \ No newline at end of file diff --git a/DataClient/ClassDiagram4.cd b/DataClient/ClassDiagram4.cd new file mode 100644 index 0000000..830666c --- /dev/null +++ b/DataClient/ClassDiagram4.cd @@ -0,0 +1,77 @@ + + + + + + AAAAACAgAgAAAgAFAAAACAACAAEAAAAAihAAAgAIAAA= + STPClient.cs + + + + + + + + + + + + + AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAA= + FileClient.cs + + + + + + AgAAAIAAAEAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAA= + ByteConverter.cs + + + + + + AAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAQAAAAA= + Struct\Analog.cs + + + + + + + + + + + Struct\Struct.cs + + + + + AAAAAAAAAAAAAAAAAIAAAAAAAAAAAgAAACAAAAAAAAA= + Struct\Struct.cs + + + + + + AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAEAAAAAAAA= + Struct\TechCycle.cs + + + + + + AAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAAAAAA= + Struct\TechCycleParams.cs + + + + + + AAAAAAAAACAAAAAAAAAAAAAAAAAEAAgAAAAgAAAAAAA= + Struct\Struct.cs + + + + \ No newline at end of file diff --git a/DataClient/Struct/TechCycle.cs b/DataClient/Struct/TechCycle.cs index 73e7976..37b0db0 100644 --- a/DataClient/Struct/TechCycle.cs +++ b/DataClient/Struct/TechCycle.cs @@ -8,34 +8,7 @@ namespace DataClient.Struct { public class TechCycle { - - public enum Oper : sbyte - { - errno = sbyte.MinValue, - end_cycle_manual = -1, - end_cycle = 0, - unload_load = 1, - vac_priv = 2, - priv = 5, - cool_priv = 6, - look_priv = 7, - vac_plav = 8, - melt_bath = 9, - plav = 10, - VUR = 11, - cool_plav = 12, - unload_kit = 13, - vac_oplav = 14, - oplav = 15, - cool_oplav = 16, - flow_metal = 17, - check_protect = 25 - } - public DateTime start; - public sbyte? index; - public Oper Operation { - get { return (index.HasValue && Enum.IsDefined(typeof(Oper), index.Value)) ? (Oper)index : Oper.errno; } - set { index = (sbyte)value; } - } + public DateTime StartDateTime { get; set; } + public sbyte? Index { get; set; } } } diff --git a/DataClient/Struct/TechCycleParams.cs b/DataClient/Struct/TechCycleParams.cs new file mode 100644 index 0000000..c5934bc --- /dev/null +++ b/DataClient/Struct/TechCycleParams.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataClient.Struct +{ + public class TechCyclesParams + { + public sbyte[] Index { get; set; } + public string[] Colors { get; set; } + public string[] Names { get; set; } + public TechCyclesParams() + { + + } + + } +} diff --git a/DataClient/Struct/TechCycles.cs b/DataClient/Struct/TechCycles.cs new file mode 100644 index 0000000..926536b --- /dev/null +++ b/DataClient/Struct/TechCycles.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataClient.Struct +{ + public class TechCycles + { + public DateTime StartDateTime { get; set; } + public sbyte? Index { get; set; } + } +} diff --git a/DataClient/bin/Debug/net5.0/DataClient.dll b/DataClient/bin/Debug/net5.0/DataClient.dll index 3716908..0e0e63a 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.dll and b/DataClient/bin/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Debug/net5.0/DataClient.pdb b/DataClient/bin/Debug/net5.0/DataClient.pdb index 2b4f6f7..a737324 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.pdb and b/DataClient/bin/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Debug/net5.0/ref/DataClient.dll b/DataClient/bin/Debug/net5.0/ref/DataClient.dll index 9be8802..5cfbbb8 100644 Binary files a/DataClient/bin/Debug/net5.0/ref/DataClient.dll and b/DataClient/bin/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/bin/Release/net5.0/DataClient.dll b/DataClient/bin/Release/net5.0/DataClient.dll index 8ff74d9..5174fdb 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.dll and b/DataClient/bin/Release/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Release/net5.0/DataClient.pdb b/DataClient/bin/Release/net5.0/DataClient.pdb index fe89768..d1758de 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.pdb and b/DataClient/bin/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Release/net5.0/ref/DataClient.dll b/DataClient/bin/Release/net5.0/ref/DataClient.dll index 13922b3..ffd34c2 100644 Binary files a/DataClient/bin/Release/net5.0/ref/DataClient.dll and b/DataClient/bin/Release/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/DataClient.csproj.nuget.dgspec.json b/DataClient/obj/DataClient.csproj.nuget.dgspec.json index 4b1431a..4cdc4ae 100644 --- a/DataClient/obj/DataClient.csproj.nuget.dgspec.json +++ b/DataClient/obj/DataClient.csproj.nuget.dgspec.json @@ -74,7 +74,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/DataClient.csproj.nuget.g.props b/DataClient/obj/DataClient.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/DataClient/obj/DataClient.csproj.nuget.g.props +++ b/DataClient/obj/DataClient.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache deleted file mode 100644 index 562b213..0000000 Binary files a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache and /dev/null differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache index 614f848..c2be34d 100644 --- a/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dd97bd7f2ddb5e6bfbcd5e8344f0cae7dc566df2 +f748f4988e8b501940eb9e6565732f937ded3bd0 diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt index 90f06a2..686c8b3 100644 --- a/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -20,7 +20,6 @@ F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.dll F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\ref\DataClient.dll F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.pdb F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.xml -F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.AssemblyReference.cache F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfoInputs.cache F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfo.cs diff --git a/DataClient/obj/Debug/net5.0/DataClient.dll b/DataClient/obj/Debug/net5.0/DataClient.dll index 3716908..0e0e63a 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.dll and b/DataClient/obj/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.pdb b/DataClient/obj/Debug/net5.0/DataClient.pdb index 2b4f6f7..a737324 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.pdb and b/DataClient/obj/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Debug/net5.0/ref/DataClient.dll b/DataClient/obj/Debug/net5.0/ref/DataClient.dll index 9be8802..5cfbbb8 100644 Binary files a/DataClient/obj/Debug/net5.0/ref/DataClient.dll and b/DataClient/obj/Debug/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig b/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig index d7e2983..9062df3 100644 --- a/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig +++ b/DataClient/obj/Release/net5.0/DataClient.GeneratedMSBuildEditorConfig.editorconfig @@ -3,6 +3,8 @@ build_property.TargetFramework = net5.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = DataClient +build_property.ProjectDir = F:\GIT\ASCKU_PC\DataClient\ diff --git a/DataClient/obj/Release/net5.0/DataClient.assets.cache b/DataClient/obj/Release/net5.0/DataClient.assets.cache index b1b6a35..82fc9e5 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.assets.cache and b/DataClient/obj/Release/net5.0/DataClient.assets.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache index 9a8b63a..f5e894a 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache and b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache index 42d4b32..490c0a9 100644 --- a/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -85eae5e91d48b2b6604876303fc37a94b53d66ee +7981c22a0647261d92af6b144cbd8cd93e91915b diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt index acc7111..6b399c2 100644 --- a/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -18,7 +18,6 @@ F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.deps.json F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.dll F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\ref\DataClient.dll F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb -F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.AssemblyReference.cache F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfoInputs.cache F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfo.cs @@ -26,3 +25,4 @@ F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.CoreCompileInput F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.AssemblyReference.cache diff --git a/DataClient/obj/Release/net5.0/DataClient.dll b/DataClient/obj/Release/net5.0/DataClient.dll index 8ff74d9..5174fdb 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.dll and b/DataClient/obj/Release/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Release/net5.0/DataClient.pdb b/DataClient/obj/Release/net5.0/DataClient.pdb index fe89768..d1758de 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.pdb and b/DataClient/obj/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Release/net5.0/ref/DataClient.dll b/DataClient/obj/Release/net5.0/ref/DataClient.dll index 13922b3..ffd34c2 100644 Binary files a/DataClient/obj/Release/net5.0/ref/DataClient.dll and b/DataClient/obj/Release/net5.0/ref/DataClient.dll differ diff --git a/DataClient/obj/project.assets.json b/DataClient/obj/project.assets.json index 1a0a914..97dc367 100644 --- a/DataClient/obj/project.assets.json +++ b/DataClient/obj/project.assets.json @@ -435,7 +435,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/project.nuget.cache b/DataClient/obj/project.nuget.cache index 78d73f4..6b3785a 100644 --- a/DataClient/obj/project.nuget.cache +++ b/DataClient/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "lCVOnkDSpCDkY6mFU39PPTK/8UioIwkzLSm5l9U0BI9kmvrQU3GBEeKlZLkvo3I3Vmgv8BfwOMFxbII4ikrnzA==", + "dgSpecHash": "0RhodP/lxgO9Rqo63kX24KtRh4luItLPyJjTY8wHfjSUMTSTT7J5Np+z1myWzh9AARikCjzF21sdzNhR8ewAXg==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "expectedPackageFiles": [ diff --git a/DataClients/obj/DataClients.csproj.nuget.dgspec.json b/DataClients/obj/DataClients.csproj.nuget.dgspec.json index f713d96..24fcb9d 100644 --- a/DataClients/obj/DataClients.csproj.nuget.dgspec.json +++ b/DataClients/obj/DataClients.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -138,7 +138,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/DataClients.csproj.nuget.g.props b/DataClients/obj/DataClients.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.props +++ b/DataClients/obj/DataClients.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.csproj.AssemblyReference.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.csproj.AssemblyReference.cache index 8ac2c96..90d28d0 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.csproj.AssemblyReference.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.csproj.AssemblyReference.cache differ diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.GeneratedMSBuildEditorConfig.editorconfig b/DataClients/obj/Release/netstandard2.0/DataClients.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..570919f --- /dev/null +++ b/DataClients/obj/Release/netstandard2.0/DataClients.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = DataClients +build_property.ProjectDir = F:\GIT\ASCKU_PC\DataClients\ diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache b/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache index 4fdc7b8..f98a70d 100644 Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache differ diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache index 75d709b..0f54af9 100644 Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache differ diff --git a/DataClients/obj/project.assets.json b/DataClients/obj/project.assets.json index 64f2ee8..fc0c682 100644 --- a/DataClients/obj/project.assets.json +++ b/DataClients/obj/project.assets.json @@ -396,7 +396,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/project.nuget.cache b/DataClients/obj/project.nuget.cache index c9f07a8..e3a71ab 100644 --- a/DataClients/obj/project.nuget.cache +++ b/DataClients/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Jx4UMAAsvJkZ+kUms9DHtVovb0p8Xu9CiAkFm801/gOSfERupzhTpmCqqA3eJA4Kluy6pj25MIa0rsKqVEe+DQ==", + "dgSpecHash": "HVQTY98NHeu7W/7iguBUpMQWbOY+swcUoVtz1QUx287JA0KDBROklqcLwTRJHqhG8C6835A11nGcZXBy6IVR1w==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "expectedPackageFiles": [ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.dll new file mode 100644 index 0000000..181b441 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.pdb b/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.pdb new file mode 100644 index 0000000..95db20f Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/DataClients.pdb differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/ICSharpCode.SharpZipLib.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..58893ba Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/ICSharpCode.SharpZipLib.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.deps.json b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.deps.json new file mode 100644 index 0000000..5d5ec7f --- /dev/null +++ b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.deps.json @@ -0,0 +1,145 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v3.1", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v3.1": { + "Korp90TimePasport/1.0.0": { + "dependencies": { + "DataClients": "1.0.0", + "System.Data.Odbc": "5.0.0" + }, + "runtime": { + "Korp90TimePasport.dll": {} + } + }, + "Microsoft.NETCore.Platforms/5.0.0": {}, + "SharpZipLib/1.2.0": { + "runtime": { + "lib/netstandard2.0/ICSharpCode.SharpZipLib.dll": { + "assemblyVersion": "1.2.0.246", + "fileVersion": "1.2.0.246" + } + } + }, + "System.Data.Odbc/5.0.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Data.Odbc.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + }, + "runtimeTargets": { + "runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll": { + "rid": "freebsd", + "assetType": "runtime", + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + }, + "runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll": { + "rid": "linux", + "assetType": "runtime", + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + }, + "runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll": { + "rid": "osx", + "assetType": "runtime", + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + }, + "runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.Encoding.CodePages/4.7.1": { + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Encoding.CodePages.dll": { + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.700.20.21406" + } + }, + "runtimeTargets": { + "runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.700.20.21406" + } + } + }, + "DataClients/1.0.0": { + "dependencies": { + "SharpZipLib": "1.2.0", + "SupportClasses": "1.0.0", + "System.Text.Encoding.CodePages": "4.7.1" + }, + "runtime": { + "DataClients.dll": {} + } + }, + "SupportClasses/1.0.0": { + "runtime": { + "SupportClasses.dll": {} + } + } + } + }, + "libraries": { + "Korp90TimePasport/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.NETCore.Platforms/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==", + "path": "microsoft.netcore.platforms/5.0.0", + "hashPath": "microsoft.netcore.platforms.5.0.0.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.Data.Odbc/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-j4WsYGmcD7m1D0Tc3N7HqWqcdUHNn9+kdXh9ODTWEsOGrAvALf+BgRStd7L0/O/zDS0R4Uu9vNM8UY6EnK+WYw==", + "path": "system.data.odbc/5.0.0", + "hashPath": "system.data.odbc.5.0.0.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/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "SupportClasses/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.dll new file mode 100644 index 0000000..d6cd1e0 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.exe b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.exe new file mode 100644 index 0000000..602326d Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.exe differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.pdb b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.pdb new file mode 100644 index 0000000..479b893 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.pdb differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.dev.json b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.dev.json new file mode 100644 index 0000000..cb610d9 --- /dev/null +++ b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.dev.json @@ -0,0 +1,10 @@ +{ + "runtimeOptions": { + "additionalProbingPaths": [ + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" + ] + } +} \ No newline at end of file diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.json b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.json new file mode 100644 index 0000000..bc456d7 --- /dev/null +++ b/Korp90TimePasport/bin/Release/netcoreapp3.1/Korp90TimePasport.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "netcoreapp3.1", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "3.1.0" + } + } +} \ No newline at end of file diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.dll new file mode 100644 index 0000000..c532435 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.pdb b/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.pdb new file mode 100644 index 0000000..edd3d57 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/SupportClasses.pdb differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Data.Odbc.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Data.Odbc.dll new file mode 100644 index 0000000..f20116d Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Data.Odbc.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Text.Encoding.CodePages.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Text.Encoding.CodePages.dll new file mode 100644 index 0000000..2f0a76d Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/System.Text.Encoding.CodePages.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll new file mode 100644 index 0000000..8c18be6 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll new file mode 100644 index 0000000..db0cde8 Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll new file mode 100644 index 0000000..632017d Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll new file mode 100644 index 0000000..025f60e Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll differ diff --git a/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll new file mode 100644 index 0000000..5b0542c Binary files /dev/null and b/Korp90TimePasport/bin/Release/netcoreapp3.1/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll differ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index 71016ce..3588a27 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json index 4bed0d5..b330552 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -145,7 +145,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -208,7 +208,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.GeneratedMSBuildEditorConfig.editorconfig b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..9b046cc --- /dev/null +++ b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = Korp90TimePasport +build_property.ProjectDir = F:\GIT\ASCKU_PC\Korp90TimePasport\ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache index 9549f55..0faf36e 100644 Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index 0e7762a..b4fc9f2 100644 Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.CopyComplete b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.CopyComplete new file mode 100644 index 0000000..e69de29 diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.CoreCompileInputs.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..bcd586a --- /dev/null +++ b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +378c38978a89043ac32340cb2886f90bbd775b15 diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.FileListAbsolute.txt b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..b11edc9 --- /dev/null +++ b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.FileListAbsolute.txt @@ -0,0 +1,26 @@ +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.exe +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.deps.json +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.runtimeconfig.json +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\Korp90TimePasport.pdb +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\ICSharpCode.SharpZipLib.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\System.Data.Odbc.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\System.Text.Encoding.CodePages.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\runtimes\freebsd\lib\netcoreapp2.0\System.Data.Odbc.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\runtimes\linux\lib\netcoreapp2.0\System.Data.Odbc.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\runtimes\osx\lib\netcoreapp2.0\System.Data.Odbc.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\runtimes\win\lib\netcoreapp2.0\System.Data.Odbc.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\runtimes\win\lib\netcoreapp2.0\System.Text.Encoding.CodePages.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\DataClients.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\SupportClasses.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\DataClients.pdb +F:\GIT\ASCKU_PC\Korp90TimePasport\bin\Release\netcoreapp3.1\SupportClasses.pdb +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.AssemblyInfo.cs +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.csproj.CopyComplete +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.dll +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.pdb +F:\GIT\ASCKU_PC\Korp90TimePasport\obj\Release\netcoreapp3.1\Korp90TimePasport.genruntimeconfig.cache diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.dll b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.dll new file mode 100644 index 0000000..d6cd1e0 Binary files /dev/null and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.dll differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.genruntimeconfig.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.genruntimeconfig.cache new file mode 100644 index 0000000..987c79e --- /dev/null +++ b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.genruntimeconfig.cache @@ -0,0 +1 @@ +f16d79ff8dc0e38810aa615f3660f7ed8f052290 diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.pdb b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.pdb new file mode 100644 index 0000000..479b893 Binary files /dev/null and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.pdb differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/apphost.exe b/Korp90TimePasport/obj/Release/netcoreapp3.1/apphost.exe new file mode 100644 index 0000000..88f1eb3 Binary files /dev/null and b/Korp90TimePasport/obj/Release/netcoreapp3.1/apphost.exe differ diff --git a/Korp90TimePasport/obj/project.assets.json b/Korp90TimePasport/obj/project.assets.json index 00388ce..3e3e132 100644 --- a/Korp90TimePasport/obj/project.assets.json +++ b/Korp90TimePasport/obj/project.assets.json @@ -294,7 +294,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/project.nuget.cache b/Korp90TimePasport/obj/project.nuget.cache index 801d03a..4af0eb5 100644 --- a/Korp90TimePasport/obj/project.nuget.cache +++ b/Korp90TimePasport/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "tizkZ0Ysdd44pdYZUmokM3n1pLd+X36F8QIbewGPbBzcEE9AOxiJJ7sw+9GeXazssgleO65MTrKw5IrjzxgfSg==", + "dgSpecHash": "AfyJ06T4D+x5HXKKm+S8oQzwBlvR9X7UGYy1RvgaGxRCU8j+4W8c97Tyg8Ftdqn0WVvi/JV4ZkAjoI20dW4k8g==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "expectedPackageFiles": [ diff --git a/Mailing/bin/Release/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll b/Mailing/bin/Release/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll index e78a1fe..45abf36 100644 Binary files a/Mailing/bin/Release/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll and b/Mailing/bin/Release/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 35965e9..63eac76 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache differ diff --git a/Mailing/obj/Mailing.csproj.nuget.dgspec.json b/Mailing/obj/Mailing.csproj.nuget.dgspec.json index b0b4f86..5597dcd 100644 --- a/Mailing/obj/Mailing.csproj.nuget.dgspec.json +++ b/Mailing/obj/Mailing.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -157,7 +157,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -224,7 +224,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -301,7 +301,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -372,7 +372,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -439,7 +439,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -502,7 +502,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/Mailing.csproj.nuget.g.props b/Mailing/obj/Mailing.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/Mailing/obj/Mailing.csproj.nuget.g.props +++ b/Mailing/obj/Mailing.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.GeneratedMSBuildEditorConfig.editorconfig b/Mailing/obj/Release/netcoreapp3.1/Mailing.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..d6aff2b --- /dev/null +++ b/Mailing/obj/Release/netcoreapp3.1/Mailing.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = Mailing +build_property.ProjectDir = F:\GIT\ASCKU_PC\Mailing\ diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache index 145b5c0..ec0d43b 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache differ diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 2327941..f5e894a 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache differ diff --git a/Mailing/obj/Release/netcoreapp3.1/apphost.exe b/Mailing/obj/Release/netcoreapp3.1/apphost.exe index c65d5fc..2687138 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/apphost.exe and b/Mailing/obj/Release/netcoreapp3.1/apphost.exe differ diff --git a/Mailing/obj/project.assets.json b/Mailing/obj/project.assets.json index b4a69a2..d3c58f7 100644 --- a/Mailing/obj/project.assets.json +++ b/Mailing/obj/project.assets.json @@ -416,7 +416,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/project.nuget.cache b/Mailing/obj/project.nuget.cache index bb3fe7f..160752b 100644 --- a/Mailing/obj/project.nuget.cache +++ b/Mailing/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "LJqCrJsyNB9LytCuT4dE39e7zbLIz6i/iKg/2yMtD+s0rFsro9NxxBVHLDsZsfBhQhHHeVcucr71wz0QRgMzUw==", + "dgSpecHash": "eI0w168TnCCUmVJjWHDhLYRIenlq2Ny17d2eqzFjpZZhdRx+35hHDLYuk4NxVWfieUtt5LzgvSAYONqn38A3zg==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "expectedPackageFiles": [ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json index dddbc15..3875fc9 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json @@ -67,7 +67,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.GeneratedMSBuildEditorConfig.editorconfig b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..8460835 --- /dev/null +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = MigraDoc.DocumentObjectModel +build_property.ProjectDir = F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache index 58abf52..4814ea2 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache index 34f4a98..7b3034d 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.FileListAbsolute.txt b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.FileListAbsolute.txt index 69045c6..54a6032 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.FileListAbsolute.txt +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.FileListAbsolute.txt @@ -10,9 +10,9 @@ D:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0 F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\bin\Release\netstandard2.0\MigraDoc.DocumentObjectModel.deps.json F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\bin\Release\netstandard2.0\MigraDoc.DocumentObjectModel.dll F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\bin\Release\netstandard2.0\MigraDoc.DocumentObjectModel.pdb -F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.AssemblyInfoInputs.cache F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.AssemblyInfo.cs F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.csproj.CoreCompileInputs.cache F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.dll F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.pdb +F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.DocumentObjectModel\obj\Release\netstandard2.0\MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json index 28aff03..65d1496 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json @@ -289,7 +289,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache index 7132270..dbff36e 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "IgtSa87a30hTEmvSKc+YQUdo7hLh+f0kinWAqI2x9y/d+BBwf6XycPkqhLgTg4VSidlGyKRIhW8xK0qIaHTsZw==", + "dgSpecHash": "CfK+R+Wdvmz+wko9QgGpcQxp6gBUS+7clDNa1qmrnv2ocS55Ox242Th+vylSgJYWiljhOIldmYjNGvHyz9u6+A==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "expectedPackageFiles": [ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll b/PrintPDF/MigraDoc.Rendering/bin/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll index e78a1fe..45abf36 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll and b/PrintPDF/MigraDoc.Rendering/bin/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache index f5e894a..e8c9495 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json index 693aed0..57c1fdc 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json @@ -67,7 +67,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -144,7 +144,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -215,7 +215,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -282,7 +282,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.GeneratedMSBuildEditorConfig.editorconfig b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ae1232d --- /dev/null +++ b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = MigraDoc.Rendering +build_property.ProjectDir = F:\GIT\ASCKU_PC\PrintPDF\MigraDoc.Rendering\ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache index 0b1d017..3929daa 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache index 0cfc540..24e9226 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache index 604e0af..efff7ab 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll index e78a1fe..45abf36 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/de/MigraDoc.Rendering.resources.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json index ad0fce5..47bb5f7 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json +++ b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json @@ -357,7 +357,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache index af473d7..cb30604 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "bDTnwokcp6TbOaajNaz0yXvVZ+HofXm9vgS5aE2/RwCzyNFEoATOOr89cFUsNtZBwCBijeGQWTYX9RAThLxU1A==", + "dgSpecHash": "fgYRE6zq4ZEQVjgdgWEtMfi/zbKZWHq5F/jdYp3HAkKJZolm/azuenZ9y0dgKdn6me/fngh8ZSDya+JxOR6I9A==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "expectedPackageFiles": [ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache index 7b3034d..f5e894a 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json index c9bf13d..2f53444 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json @@ -71,7 +71,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } }, @@ -138,7 +138,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.GeneratedMSBuildEditorConfig.editorconfig b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..df997d1 --- /dev/null +++ b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = PdfSharp.Charting +build_property.ProjectDir = F:\GIT\ASCKU_PC\PrintPDF\PdfSharp.Charting\ diff --git a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache index 09fbad7..c2f1603 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache and b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache index d651ccb..f5e894a 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/project.assets.json b/PrintPDF/PdfSharp.Charting/obj/project.assets.json index 97ad74d..f7563fb 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.assets.json +++ b/PrintPDF/PdfSharp.Charting/obj/project.assets.json @@ -312,7 +312,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache index f0c350a..6ef9b64 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "w6ImBakjanJ2rg89haorn71y5kBxVm6Ng5vEtZkR5Gjcg1UvrsoJk0aw86WoEzmJw76Uv7kaYT82eTMiYaQwgg==", + "dgSpecHash": "sPDBO/12MsDuRbxOu5Ahdhx7OVTc4jUK2D1RlMOCsESNA+PI4kr/linF1oCLGMhd1185PhLs5uQVYEFlIFW+2A==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "expectedPackageFiles": [ diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json index f7a5cf8..e3b0685 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json @@ -67,7 +67,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props index b7eb83f..d6c6d76 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference - 5.10.0 + 5.11.1 diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.GeneratedMSBuildEditorConfig.editorconfig b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..2b5dcb6 --- /dev/null +++ b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = PdfSharp +build_property.ProjectDir = F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\ diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache index 7ff90b7..f7a6b64 100644 Binary files a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache and b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache differ diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache index fcc67aa..f5e894a 100644 Binary files a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache and b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.FileListAbsolute.txt b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.FileListAbsolute.txt index 82d2fad..af168e6 100644 --- a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.FileListAbsolute.txt +++ b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.FileListAbsolute.txt @@ -12,7 +12,6 @@ D:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.pdb F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\bin\Release\netstandard2.0\PdfSharp.deps.json F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\bin\Release\netstandard2.0\PdfSharp.dll F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\bin\Release\netstandard2.0\PdfSharp.pdb -F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.csproj.AssemblyReference.cache F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.Forms.PagePreview.resources F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.csproj.GenerateResource.cache F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.AssemblyInfoInputs.cache @@ -20,3 +19,4 @@ F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.AssemblyIn F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.csproj.CoreCompileInputs.cache F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.dll F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.pdb +F:\GIT\ASCKU_PC\PrintPDF\PdfSharp\obj\Release\netstandard2.0\PdfSharp.csproj.AssemblyReference.cache diff --git a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.GenerateResource.cache b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.GenerateResource.cache index ce1ea3a..5939977 100644 Binary files a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.GenerateResource.cache and b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.csproj.GenerateResource.cache differ diff --git a/PrintPDF/PdfSharp/obj/project.assets.json b/PrintPDF/PdfSharp/obj/project.assets.json index f306a2b..8686cf6 100644 --- a/PrintPDF/PdfSharp/obj/project.assets.json +++ b/PrintPDF/PdfSharp/obj/project.assets.json @@ -289,7 +289,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/project.nuget.cache b/PrintPDF/PdfSharp/obj/project.nuget.cache index 6cab9dd..d78f623 100644 --- a/PrintPDF/PdfSharp/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "IBl924vmWiOYYnST8LHVzZeTj/m3S0bcbDhnrLu1O6YE4OWnIlS0w51gKWDAYci7lQVioY/598FEC/7aL1FmQg==", + "dgSpecHash": "k8JGzn+F2zNG4s5xEtKeUlgul6bw8gWG4AW1kOpnJfvxdzcLVtORsdsDBmyejlQ0m/mA1CMeuKklpxTqVUx4jQ==", "success": true, "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "expectedPackageFiles": [ diff --git a/Site/analog.html b/Site/analog.html new file mode 100644 index 0000000..4eda8b5 --- /dev/null +++ b/Site/analog.html @@ -0,0 +1,121 @@ + + + + + + ВДП + + + + + +
+
+
+

Аналоги

+
+
+ + + + + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + diff --git a/Site/discret.html b/Site/discret.html new file mode 100644 index 0000000..d2e68a2 --- /dev/null +++ b/Site/discret.html @@ -0,0 +1,133 @@ + + + + + + ВДП + + + + + +
+
+
+

Дискреты

+
+
+ + + + + + + + +
+
+ + + + + + + + + + + + +
№ИндексВремя началаНазваниеСостояние
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + diff --git a/Site/index.html b/Site/index.html index a21a05f..dda448d 100644 --- a/Site/index.html +++ b/Site/index.html @@ -10,23 +10,25 @@
+

РМТ "САУ ВДП" и "КОРПУС"

- +
+
Поиск по дате:
- +
-
@@ -35,15 +37,16 @@ Список паспортов:
- +
-
+
@@ -53,7 +56,7 @@ Печь №
- +
@@ -62,45 +65,78 @@
- +
- +
Конец:
- +
- +
-
- -