ivan-igorevich/mdm-ordinis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/mission-spacecraft-codes-fk' into 'main'

Browse Source 
feat(cuod): FK-уборка — country, industry_sector, spacecraft, frequency_band

See merge request 2-6/2-6-4/terravault/ordinis!258
This commit is contained in:
Александр Зимин
2026-05-25 11:22:15 +00:00
parent 99fabc3245 cd5ee1fcf6
commit 9418784ca4
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ordinis-cuod-bundle/src/main/resources/bundles/cuod/antenna.schema.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/antenna/1.0.0",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/antenna/1.1.0",
"title": "Antenna (наземные антенны)",
"description": "Антенны наземных станций приёма с характеристиками. FK на ground_station.",
"type": "object",
@@ -12,7 +12,7 @@
"name": { "type": "object", "x-localized": true, "patternProperties": { "^[a-z]{2}-[A-Z]{2}$": { "type": "string", "minLength": 1 } }, "required": ["ru-RU"] },
"ground_station": { "type": "string", "description": "FK ground_station.code.", "pattern": "^[A-Z][A-Z0-9_]{1,31}$", "x-references": "ground_station.code" },
"diameter_m": { "type": "number", "minimum": 0.5, "maximum": 100 },
"supported_bands": { "type": "array", "items": { "type": "string", "pattern": "^[A-Z][A-Z0-9_]{1,31}$" }, "uniqueItems": true },
"supported_bands": { "type": "array", "description": "Поддерживаемые радиодиапазоны — FK на frequency_band.code (C, X, Ku, Ka и т.п.)", "items": { "type": "string", "pattern": "^[A-Z][A-Z0-9_]{1,31}$", "x-references": "frequency_band.code" }, "uniqueItems": true },
"g_t_db_per_k": { "type": "number", "description": "G/T (gain over noise temperature), дБ/К.", "minimum": -10, "maximum": 60 },
"status": { "type": "string", "enum": ["active", "maintenance", "decommissioned", "archived"] }
}
ordinis-cuod-bundle/src/main/resources/bundles/cuod/consumer.schema.json
+3 -3
View File
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/consumer/1.0.0",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/consumer/1.1.0",
"title": "Consumer (потребитель данных ДЗЗ)",
"description": "Юридические лица — заказчики/получатели снимков и продуктов ЦУОД.",
"type": "object",
@@ -24,8 +24,8 @@
"pattern": "^[A-Z][A-Z0-9_]{1,31}$",
"x-references": "consumer_type.code"
},
"industry_sector": { "type": "string", "pattern": "^[A-Z][A-Z0-9_]{1,31}$" },
"country": { "type": "string", "pattern": "^[A-Z]{2}$" },
"industry_sector": { "type": "string", "description": "FK на industry_sector.code.", "pattern": "^[A-Z][A-Z0-9_]{1,31}$", "x-references": "industry_sector.code" },
"country": { "type": "string", "description": "FK на country.code (ISO 3166-1 alpha-2).", "pattern": "^[A-Z]{2}$", "x-references": "country.code" },
"inn": {
"type": "string",
"description": "ИНН (10 или 12 цифр).",
ordinis-cuod-bundle/src/main/resources/bundles/cuod/manifest.json
+5 -5
View File
@@ -2,16 +2,16 @@
"bundle": "cuod",
"displayName": "ЦУОД ДЗЗ",
"description": "Bundle справочников для Центра Управления Обработкой Данных ДЗЗ. Anchor v1.",
"version": "1.3.3",
"version": "1.3.5",
"supportedLocales": ["ru-RU", "en-US"],
"defaultLocale": "ru-RU",
"dictionaries": [
{ "name": "spacecraft", "displayName": "Космические аппараты", "description": "Каталог КА (космических аппаратов) ДЗЗ-миссий", "scope": "PUBLIC", "schemaResource": "spacecraft.schema.json", "schemaVersion": "2.0.0", "approvalRequired": true },
{ "name": "spacecraft", "displayName": "Космические аппараты", "description": "Каталог КА (космических аппаратов) ДЗЗ-миссий", "scope": "PUBLIC", "schemaResource": "spacecraft.schema.json", "schemaVersion": "2.1.0", "approvalRequired": true },
{ "name": "satellite_type", "displayName": "Типы КА", "description": "Классификация типов космических аппаратов по миссиям и характеристикам", "scope": "PUBLIC", "schemaResource": "satellite_type.schema.json", "schemaVersion": "1.0.0" },
{ "name": "spacecraft_status", "displayName": "Статусы КА", "description": "Жизненный цикл КА: planned → operational → decommissioned/lost.", "scope": "PUBLIC", "schemaResource": "spacecraft_status.schema.json", "schemaVersion": "1.0.0" },
{ "name": "ground_station", "displayName": "Наземные станции", "description": "Каталог наземных пунктов приёма и управления", "scope": "PUBLIC", "schemaResource": "ground_station.schema.json", "schemaVersion": "1.0.0", "approvalRequired": true },
{ "name": "antenna", "displayName": "Антенны", "description": "Антенны наземных станций с G/T и поддерживаемыми диапазонами.", "scope": "PUBLIC", "schemaResource": "antenna.schema.json", "schemaVersion": "1.0.0" },
{ "name": "mission", "displayName": "Миссии / программы", "description": "Программы ДЗЗ — Ресурс-П, Канопус-В, Sentinel и т.д. Группируют семейства КА.", "scope": "PUBLIC", "schemaResource": "mission.schema.json", "schemaVersion": "1.0.0" },
{ "name": "antenna", "displayName": "Антенны", "description": "Антенны наземных станций с G/T и поддерживаемыми диапазонами.", "scope": "PUBLIC", "schemaResource": "antenna.schema.json", "schemaVersion": "1.1.0" },
{ "name": "mission", "displayName": "Миссии / программы", "description": "Программы ДЗЗ — Ресурс-П, Канопус-В, Sentinel и т.д. Группируют семейства КА.", "scope": "PUBLIC", "schemaResource": "mission.schema.json", "schemaVersion": "1.1.0" },
{ "name": "instrument", "displayName": "Инструменты съёмки", "description": "Полезная нагрузка / сенсоры на борту КА (Геотон-Л1, MODIS, C-SAR, ...)", "scope": "PUBLIC", "schemaResource": "instrument.schema.json", "schemaVersion": "1.1.0", "approvalRequired": true },
{ "name": "sensor_type", "displayName": "Типы сенсоров", "description": "Класс полезной нагрузки: optical/SAR/hyperspectral/lidar/thermal.", "scope": "PUBLIC", "schemaResource": "sensor_type.schema.json", "schemaVersion": "1.0.0" },
{ "name": "spectral_band", "displayName": "Спектральные каналы", "description": "Стандартные оптические/ИК каналы (PAN/R/G/B/NIR/SWIR/TIR).", "scope": "PUBLIC", "schemaResource": "spectral_band.schema.json", "schemaVersion": "1.0.0" },
@@ -37,7 +37,7 @@
{ "name": "imaging_task_type", "displayName": "Типы задач на съёмку", "description": "Плановая периодическая, заказная, экстренная, стерео.", "scope": "PUBLIC", "schemaResource": "imaging_task_type.schema.json", "schemaVersion": "1.0.0" },
{ "name": "acquisition_mode", "displayName": "Режимы съёмки", "description": "Nadir/off-nadir/Stripmap/Spotlight/ScanSAR/Stereo.", "scope": "PUBLIC", "schemaResource": "acquisition_mode.schema.json", "schemaVersion": "1.0.0" },
{ "name": "priority_class", "displayName": "Классы приоритета", "description": "P0–P5 универсальные приоритеты для tasking и доставки.", "scope": "PUBLIC", "schemaResource": "priority_class.schema.json", "schemaVersion": "1.0.0" },
{ "name": "consumer", "displayName": "Потребители", "description": "Юр. лица — заказчики и получатели снимков (МЧС, Минприроды, Росреестр).", "scope": "INTERNAL", "schemaResource": "consumer.schema.json", "schemaVersion": "1.0.0" },
{ "name": "consumer", "displayName": "Потребители", "description": "Юр. лица — заказчики и получатели снимков (МЧС, Минприроды, Росреестр).", "scope": "INTERNAL", "schemaResource": "consumer.schema.json", "schemaVersion": "1.1.0" },
{ "name": "consumer_type", "displayName": "Типы потребителей", "description": "Министерство/агентство/госпредприятие/коммерческая.", "scope": "PUBLIC", "schemaResource": "consumer_type.schema.json", "schemaVersion": "1.0.0" },
{ "name": "industry_sector", "displayName": "Отрасли применения", "description": "Сельхоз/лесное/картография/ЧС/экология/нефтегаз/Арктика.", "scope": "PUBLIC", "schemaResource": "industry_sector.schema.json", "schemaVersion": "1.0.0" },
{ "name": "coverage_zone", "displayName": "Зоны покрытия", "description": "Федеральные округа РФ + Арктическая зона.", "scope": "PUBLIC", "schemaResource": "coverage_zone.schema.json", "schemaVersion": "1.0.0" },
ordinis-cuod-bundle/src/main/resources/bundles/cuod/mission.schema.json
+6 -5
View File
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/mission/1.0.0",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/mission/1.1.0",
"title": "Mission (программа / семейство КА)",
"description": "Программа ДЗЗ — например Ресурс, Канопус, Sentinel. Группирует семейство spacecraft, общие цели и задачи.",
"type": "object",
@@ -33,8 +33,8 @@
},
"spacecraft_codes": {
"type": "array",
"description": "businessKey'и из spacecraft, входящих в эту программу",
"items": { "type": "string" },
"description": "Спутники программы — FK на spacecraft.designator",
"items": { "type": "string", "x-references": "spacecraft.designator" },
"uniqueItems": true
},
"operator": {
@@ -47,8 +47,9 @@
},
"country": {
"type": "string",
"description": "ISO 3166-1 alpha-2 код страны",
"pattern": "^[A-Z]{2}$"
"description": "Страна программы — FK на country.code (ISO 3166-1 alpha-2)",
"pattern": "^[A-Z]{2}$",
"x-references": "country.code"
},
"status": {
"type": "string",
ordinis-cuod-bundle/src/main/resources/bundles/cuod/spacecraft.schema.json
+4 -3
View File
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/spacecraft/1.0.0",
"$id": "https://ordinis.nstart.cloud/schemas/cuod/spacecraft/2.1.0",
"title": "Spacecraft (КА)",
"description": "Космический аппарат ДЗЗ. Идентифицируется designator'ом (международное обозначение COSPAR/NORAD ID).",
"type": "object",
@@ -36,8 +36,9 @@
},
"country": {
"type": "string",
"description": "ISO 3166-1 alpha-2 код страны-оператора",
"pattern": "^[A-Z]{2}$"
"description": "Страна-оператор — FK на country.code (ISO 3166-1 alpha-2)",
"pattern": "^[A-Z]{2}$",
"x-references": "country.code"
},
"satellite_type_code": {
"type": "string",