diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index d6dda47c..29b9c164 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -226,74 +226,74 @@ namespace AsbCloudDb.Model new WellOperationCategory {Id = 16, Name = "Вращение без циркуляции", Code = 0 }, new WellOperationCategory {Id = 17, Name = "На поверхности", Code = 0 }, // Операции ручного ввода - new WellOperationCategory {Id = 18, Name = "Бурение", Code = 0 }, - new WellOperationCategory {Id = 19, Name = "Бурение в интервале", Code = 0 }, - new WellOperationCategory {Id = 20, Name = "Бурение до глубины", Code = 0 }, - new WellOperationCategory {Id = 21, Name = "Бурение под направление", Code = 0 }, - new WellOperationCategory {Id = 22, Name = "ГИС (инклиметрия)", Code = 0 }, - new WellOperationCategory {Id = 23, Name = "ГИС (инклинометрия)", Code = 0 }, - new WellOperationCategory {Id = 24, Name = "ГФР - АМАК, АКЦ кондуктора", Code = 0 }, - new WellOperationCategory {Id = 25, Name = "Демонтаж ПВО, Установка ФА", Code = 0 }, - new WellOperationCategory {Id = 26, Name = "Оборудование устья", Code = 0 }, - new WellOperationCategory {Id = 27, Name = "ОЗЦ", Code = 0 }, - new WellOperationCategory {Id = 28, Name = "ГИС", Code = 0 }, - new WellOperationCategory {Id = 29, Name = "Окончание цикла бурения", Code = 0 }, - new WellOperationCategory {Id = 30, Name = "Опрессовка ПВО", Code = 0 }, - new WellOperationCategory {Id = 31, Name = "Опресовка Ц.К.", Code = 0 }, - new WellOperationCategory {Id = 32, Name = "Опрессовка ВЗД", Code = 0 }, - new WellOperationCategory {Id = 33, Name = "Перевод скв на KCL", Code = 0 }, - new WellOperationCategory {Id = 34, Name = "Перезапись гаммы", Code = 0 }, - new WellOperationCategory {Id = 35, Name = "Перезапись ГК", Code = 0 }, - new WellOperationCategory {Id = 36, Name = "Перетяжка тальканата", Code = 0 }, - new WellOperationCategory {Id = 37, Name = "Подъем", Code = 0 }, - new WellOperationCategory {Id = 38, Name = "Подъем ЛБТ", Code = 0 }, - new WellOperationCategory {Id = 39, Name = "Подъем инструмента", Code = 0 }, - new WellOperationCategory {Id = 40, Name = "ПР и Сборка КНБК", Code = 0 }, - new WellOperationCategory {Id = 41, Name = "ПР к бурению и сборке КНБК", Code = 0 }, - new WellOperationCategory {Id = 42, Name = "ПР к промывке", Code = 0 }, - new WellOperationCategory {Id = 43, Name = "ПР к спуску кондуктора", Code = 0 }, - new WellOperationCategory {Id = 44, Name = "ПР к спуску направления", Code = 0 }, - new WellOperationCategory {Id = 45, Name = "ПР к спуску ОК", Code = 0 }, - new WellOperationCategory {Id = 46, Name = "ПР к спуску ЭК-146", Code = 0 }, - new WellOperationCategory {Id = 47, Name = "ПР к цементажу", Code = 0 }, - new WellOperationCategory {Id = 48, Name = "ПР к цементированию кондуктора", Code = 0 }, - new WellOperationCategory {Id = 49, Name = "ПР к цементированию направления", Code = 0 }, - new WellOperationCategory {Id = 50, Name = "ПР к цементированию ЭК", Code = 0 }, - new WellOperationCategory {Id = 51, Name = "ПР. Спуск направления", Code = 0 }, - new WellOperationCategory {Id = 52, Name = "ПР. цементаж направления", Code = 0 }, - new WellOperationCategory {Id = 53, Name = "Промывка", Code = 0 }, - new WellOperationCategory {Id = 54, Name = "Промежуточная промывка", Code = 0 }, - new WellOperationCategory {Id = 55, Name = "Промывка на забое", Code = 0 }, - new WellOperationCategory {Id = 56, Name = "Промывка перед бурением", Code = 0 }, - new WellOperationCategory {Id = 57, Name = "Промывка перед ГИС", Code = 0 }, - new WellOperationCategory {Id = 58, Name = "Промывка перед подъемом", Code = 0 }, - new WellOperationCategory {Id = 59, Name = "Промывка перед цементажем", Code = 0 }, - new WellOperationCategory {Id = 60, Name = "Промывка перед цементированием", Code = 0 }, - new WellOperationCategory {Id = 61, Name = "Промывка прокачка", Code = 0 }, - new WellOperationCategory {Id = 62, Name = "Промывка с прокачкой", Code = 0 }, - new WellOperationCategory {Id = 63, Name = "Разборка КНБК", Code = 0 }, - new WellOperationCategory {Id = 64, Name = "Разбуривание тех.оснастки", Code = 0 }, - new WellOperationCategory {Id = 65, Name = "Разбурка ЦКОДа", Code = 0 }, - new WellOperationCategory {Id = 66, Name = "Ремонт наг.линии подпорного насоса", Code = 0 }, - new WellOperationCategory {Id = 67, Name = "Ремонт наг.линии подпорного насоса", Code = 0 }, - new WellOperationCategory {Id = 68, Name = "Сборка КНБК", Code = 0 }, - new WellOperationCategory {Id = 69, Name = "Сборка роторной КНБК", Code = 0 }, - new WellOperationCategory {Id = 70, Name = "Спуск инструмента", Code = 0 }, - new WellOperationCategory {Id = 71, Name = "Спуск КНБК", Code = 0 }, - new WellOperationCategory {Id = 72, Name = "Подъем КНБК", Code = 0 }, - new WellOperationCategory {Id = 73, Name = "Спуск ЛБТ", Code = 0 }, - new WellOperationCategory {Id = 74, Name = "Спуск ОК", Code = 0 }, - new WellOperationCategory {Id = 75, Name = "Спуск ЭК", Code = 0 }, - new WellOperationCategory {Id = 76, Name = "Тех СПО", Code = 0 }, - new WellOperationCategory {Id = 77, Name = "Тех СПО-подъем", Code = 0 }, - new WellOperationCategory {Id = 78, Name = "Тех СПО-спуск", Code = 0 }, - new WellOperationCategory {Id = 79, Name = "ТО СВП", Code = 0 }, - new WellOperationCategory {Id = 80, Name = "Цементаж", Code = 0 }, - new WellOperationCategory {Id = 81, Name = "Цементаж кондуктора", Code = 0 }, - new WellOperationCategory {Id = 82, Name = "Цементаж направления", Code = 0 }, - new WellOperationCategory {Id = 83, Name = "Цементаж ЭК", Code = 0 }, - new WellOperationCategory {Id = 84, Name = "Шаблонировка ствола", Code = 0 }, - new WellOperationCategory {Id = 85, Name = "Cпуск направления", Code = 0 } + new WellOperationCategory {Id = 1018, Name = "Бурение", Code = 0 }, + new WellOperationCategory {Id = 1019, Name = "Бурение в интервале", Code = 0 }, + new WellOperationCategory {Id = 1020, Name = "Бурение до глубины", Code = 0 }, + new WellOperationCategory {Id = 1021, Name = "Бурение под направление", Code = 0 }, + new WellOperationCategory {Id = 1022, Name = "ГИС (инклиметрия)", Code = 0 }, + new WellOperationCategory {Id = 1023, Name = "ГИС (инклинометрия)", Code = 0 }, + new WellOperationCategory {Id = 1024, Name = "ГФР - АМАК, АКЦ кондуктора", Code = 0 }, + new WellOperationCategory {Id = 1025, Name = "Демонтаж ПВО, Установка ФА", Code = 0 }, + new WellOperationCategory {Id = 1026, Name = "Оборудование устья", Code = 0 }, + new WellOperationCategory {Id = 1027, Name = "ОЗЦ", Code = 0 }, + new WellOperationCategory {Id = 1028, Name = "ГИС", Code = 0 }, + new WellOperationCategory {Id = 1029, Name = "Окончание цикла бурения", Code = 0 }, + new WellOperationCategory {Id = 1030, Name = "Опрессовка ПВО", Code = 0 }, + new WellOperationCategory {Id = 1031, Name = "Опресовка Ц.К.", Code = 0 }, + new WellOperationCategory {Id = 1032, Name = "Опрессовка ВЗД", Code = 0 }, + new WellOperationCategory {Id = 1033, Name = "Перевод скв на KCL", Code = 0 }, + new WellOperationCategory {Id = 1034, Name = "Перезапись гаммы", Code = 0 }, + new WellOperationCategory {Id = 1035, Name = "Перезапись ГК", Code = 0 }, + new WellOperationCategory {Id = 1036, Name = "Перетяжка тальканата", Code = 0 }, + new WellOperationCategory {Id = 1037, Name = "Подъем", Code = 0 }, + new WellOperationCategory {Id = 1038, Name = "Подъем ЛБТ", Code = 0 }, + new WellOperationCategory {Id = 1039, Name = "Подъем инструмента", Code = 0 }, + new WellOperationCategory {Id = 1040, Name = "ПР и Сборка КНБК", Code = 0 }, + new WellOperationCategory {Id = 1041, Name = "ПР к бурению и сборке КНБК", Code = 0 }, + new WellOperationCategory {Id = 1042, Name = "ПР к промывке", Code = 0 }, + new WellOperationCategory {Id = 1043, Name = "ПР к спуску кондуктора", Code = 0 }, + new WellOperationCategory {Id = 1044, Name = "ПР к спуску направления", Code = 0 }, + new WellOperationCategory {Id = 1045, Name = "ПР к спуску ОК", Code = 0 }, + new WellOperationCategory {Id = 1046, Name = "ПР к спуску ЭК-146", Code = 0 }, + new WellOperationCategory {Id = 1047, Name = "ПР к цементажу", Code = 0 }, + new WellOperationCategory {Id = 1048, Name = "ПР к цементированию кондуктора", Code = 0 }, + new WellOperationCategory {Id = 1049, Name = "ПР к цементированию направления", Code = 0 }, + new WellOperationCategory {Id = 1050, Name = "ПР к цементированию ЭК", Code = 0 }, + new WellOperationCategory {Id = 1051, Name = "ПР. Спуск направления", Code = 0 }, + new WellOperationCategory {Id = 1052, Name = "ПР. цементаж направления", Code = 0 }, + new WellOperationCategory {Id = 1053, Name = "Промывка", Code = 0 }, + new WellOperationCategory {Id = 1054, Name = "Промежуточная промывка", Code = 0 }, + new WellOperationCategory {Id = 1055, Name = "Промывка на забое", Code = 0 }, + new WellOperationCategory {Id = 1056, Name = "Промывка перед бурением", Code = 0 }, + new WellOperationCategory {Id = 1057, Name = "Промывка перед ГИС", Code = 0 }, + new WellOperationCategory {Id = 1058, Name = "Промывка перед подъемом", Code = 0 }, + new WellOperationCategory {Id = 1059, Name = "Промывка перед цементажем", Code = 0 }, + new WellOperationCategory {Id = 1060, Name = "Промывка перед цементированием", Code = 0 }, + new WellOperationCategory {Id = 1061, Name = "Промывка прокачка", Code = 0 }, + new WellOperationCategory {Id = 1062, Name = "Промывка с прокачкой", Code = 0 }, + new WellOperationCategory {Id = 1063, Name = "Разборка КНБК", Code = 0 }, + new WellOperationCategory {Id = 1064, Name = "Разбуривание тех.оснастки", Code = 0 }, + new WellOperationCategory {Id = 1065, Name = "Разбурка ЦКОДа", Code = 0 }, + new WellOperationCategory {Id = 1066, Name = "Ремонт наг.линии подпорного насоса", Code = 0 }, + new WellOperationCategory {Id = 1067, Name = "Ремонт наг.линии подпорного насоса", Code = 0 }, + new WellOperationCategory {Id = 1068, Name = "Сборка КНБК", Code = 0 }, + new WellOperationCategory {Id = 1069, Name = "Сборка роторной КНБК", Code = 0 }, + new WellOperationCategory {Id = 1070, Name = "Спуск инструмента", Code = 0 }, + new WellOperationCategory {Id = 1071, Name = "Спуск КНБК", Code = 0 }, + new WellOperationCategory {Id = 1072, Name = "Подъем КНБК", Code = 0 }, + new WellOperationCategory {Id = 1073, Name = "Спуск ЛБТ", Code = 0 }, + new WellOperationCategory {Id = 1074, Name = "Спуск ОК", Code = 0 }, + new WellOperationCategory {Id = 1075, Name = "Спуск ЭК", Code = 0 }, + new WellOperationCategory {Id = 1076, Name = "Тех СПО", Code = 0 }, + new WellOperationCategory {Id = 1077, Name = "Тех СПО-подъем", Code = 0 }, + new WellOperationCategory {Id = 1078, Name = "Тех СПО-спуск", Code = 0 }, + new WellOperationCategory {Id = 1079, Name = "ТО СВП", Code = 0 }, + new WellOperationCategory {Id = 1080, Name = "Цементаж", Code = 0 }, + new WellOperationCategory {Id = 1081, Name = "Цементаж кондуктора", Code = 0 }, + new WellOperationCategory {Id = 1082, Name = "Цементаж направления", Code = 0 }, + new WellOperationCategory {Id = 1083, Name = "Цементаж ЭК", Code = 0 }, + new WellOperationCategory {Id = 1084, Name = "Шаблонировка ствола", Code = 0 }, + new WellOperationCategory {Id = 1085, Name = "Cпуск направления", Code = 0 } }); }); @@ -409,6 +409,52 @@ namespace AsbCloudDb.Model }); }); + modelBuilder.Entity(entity => + { + entity.HasData(new List { + new WellOperation{ Id = 1, IdWell = 1, IdWellSectionType = 1, + IdOperationCategory = 18, Type = 0, + WellDepth = 200, StartDate = DateTime.Now.AddHours(1), + DurationHours = 1.2}, + new WellOperation{ Id = 2, IdWell = 1, IdWellSectionType = 1, + IdOperationCategory = 18, Type = 1, + WellDepth = 300, StartDate = DateTime.Now.AddHours(1), + DurationHours = 1}, + new WellOperation{ Id = 3, IdWell = 1, IdWellSectionType = 1, + IdOperationCategory = 71, Type = 0, + WellDepth = 400, StartDate = DateTime.Now.AddHours(2.5), + DurationHours = 15.2}, + new WellOperation{ Id = 4, IdWell = 1, IdWellSectionType = 1, + IdOperationCategory = 71, Type = 1, + WellDepth = 500, StartDate = DateTime.Now.AddHours(3), + DurationHours = 17.2}, + new WellOperation{ Id = 5, IdWell = 1, IdWellSectionType = 2, + IdOperationCategory = 72, Type = 0, + WellDepth = 600, StartDate = DateTime.Now.AddHours(4), + DurationHours = 5}, + new WellOperation{ Id = 6, IdWell = 1, IdWellSectionType = 2, + IdOperationCategory = 72, Type = 1, + WellDepth = 700, StartDate = DateTime.Now.AddHours(4.3), + DurationHours = 7}, + new WellOperation{ Id = 7, IdWell = 1, IdWellSectionType = 2, + IdOperationCategory = 74, Type = 0, + WellDepth = 800, StartDate = DateTime.Now.AddHours(5), + DurationHours = 12}, + new WellOperation{ Id = 8, IdWell = 1, IdWellSectionType = 2, + IdOperationCategory = 74, Type = 1, + WellDepth = 900, StartDate = DateTime.Now.AddHours(4.5), + DurationHours = 12}, + new WellOperation{ Id = 9, IdWell = 1, IdWellSectionType = 3, + IdOperationCategory = 72, Type = 0, + WellDepth = 950, StartDate = DateTime.Now.AddHours(5), + DurationHours = 2}, + new WellOperation{ Id = 10, IdWell = 1, IdWellSectionType = 3, + IdOperationCategory = 72, Type = 1, + WellDepth = 900, StartDate = DateTime.Now.AddHours(5), + DurationHours = 2.5} + }); + }); + modelBuilder.Entity(entity => { entity.HasData(new List{ diff --git a/AsbCloudInfrastructure/Services/WellSectionService.cs b/AsbCloudInfrastructure/Services/WellSectionService.cs index 937029fa..a0579126 100644 --- a/AsbCloudInfrastructure/Services/WellSectionService.cs +++ b/AsbCloudInfrastructure/Services/WellSectionService.cs @@ -52,7 +52,6 @@ namespace AsbCloudInfrastructure.Services if (!wellOperationsGroupedBySections.Any()) return result; - // TODO: Подставить нормальные ID операций спускоа, подъема и т.д. var depthsPlanFactList = GetWellDepthPlanFact(wellOperationsGroupedBySections).ToList(); var durationsPlanFactList = GetWellDurationPlanFact(wellOperationsGroupedBySections).ToList(); @@ -73,7 +72,8 @@ namespace AsbCloudInfrastructure.Services { var dto = new WellSectionDto { - SectionType = wellOperationsGroupedBySections[i].FirstOrDefault().OperationCategory.Name, + SectionType = wellOperationsGroupedBySections[i] + .FirstOrDefault().OperationCategory.Name, WellDepthPlan = depthsPlanFactList[i].DepthPlan, WellDepthFact = depthsPlanFactList[i].DepthFact, DurationPlan = durationsPlanFactList[i].DurationPlan,