From b43445491fdb0aa6f31e2a05a2297e3dcc6f9785 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 5 Mar 2025 18:24:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B0=20UD?= =?UTF-8?q?O=5FT=5FEQUIPDSCMML.PRECISION=5FP=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0,=20UDO=5FT=5FEQUIPDSCMML.PRECISION=5FF=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D0=B2=20PRECISION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/UDO_PKG_EQUIPDS.pck | 20 +++++++++---------- db/UDO_PKG_EQUIPDS_BASE.pck | 20 +++++++++---------- db/UDO_T_EQUIPDSCMML.sql | 9 +++------ .../admin_tab_layout.js | 4 ++-- .../forecast_tab_layout.js | 8 ++++---- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/db/UDO_PKG_EQUIPDS.pck b/db/UDO_PKG_EQUIPDS.pck index 4291e4e..6074d57 100644 --- a/db/UDO_PKG_EQUIPDS.pck +++ b/db/UDO_PKG_EQUIPDS.pck @@ -1139,7 +1139,7 @@ create or replace package body UDO_PKG_EQUIPDS as SHINT => 'Алгоритм прогонозирования модели:
' || UDO_PKG_EQUIPDS_BASE.CMML_TASK_HINT()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, - SNAME => 'NPRECISION_F', + SNAME => 'NPRECISION', SCAPTION => 'Точность', SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, @@ -1167,7 +1167,7 @@ create or replace package body UDO_PKG_EQUIPDS as /* Обходим данные */ for C in (select T.RN NRN, T.TASK STASK, - T.PRECISION_F NPRECISION_F, + T.PRECISION NPRECISION, DM.MEAS_MNEMO SDICMUNTS, T.DATASET_ID NDATASET_ID, (select F.DATASET_TS @@ -1187,7 +1187,7 @@ create or replace package body UDO_PKG_EQUIPDS as /* Добавляем колонки с данными */ PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NRN', NVALUE => C.NRN, BCLEAR => true); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'STASK', SVALUE => C.STASK); - PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NPRECISION_F', NVALUE => C.NPRECISION_F); + PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NPRECISION', NVALUE => C.NPRECISION); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SDICMUNTS', SVALUE => C.SDICMUNTS); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SDATASET', @@ -1348,7 +1348,7 @@ create or replace package body UDO_PKG_EQUIPDS as SHINT => 'Алгоритм прогонозирования модели:
' || UDO_PKG_EQUIPDS_BASE.CMML_TASK_HINT()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, - SNAME => 'NPRECISION_F', + SNAME => 'NPRECISION', SCAPTION => 'Точность', SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, @@ -1375,7 +1375,7 @@ create or replace package body UDO_PKG_EQUIPDS as T.PRN NEQUIPDSCM, DS.NAME SNEQUIPDS, T.TASK STASK, - T.PRECISION_F NPRECISION_F, + T.PRECISION NPRECISION, DM.MEAS_MNEMO SDICMUNTS, T.STATUS NSTATUS, T.ERR SERR @@ -1395,7 +1395,7 @@ create or replace package body UDO_PKG_EQUIPDS as PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NEQUIPDSCM', NVALUE => C.NEQUIPDSCM); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SNEQUIPDS', SVALUE => C.SNEQUIPDS); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'STASK', SVALUE => C.STASK); - PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NPRECISION_F', NVALUE => C.NPRECISION_F); + PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NPRECISION', NVALUE => C.NPRECISION); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SDICMUNTS', SVALUE => C.SDICMUNTS); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'NSTATUS', NVALUE => C.NSTATUS); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SERR', SVALUE => C.SERR); @@ -1498,7 +1498,7 @@ create or replace package body UDO_PKG_EQUIPDS as SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_STR, SHINT => UDO_PKG_EQUIPDS_BASE.CMML_TASK_HINT()); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, - SNAME => 'NEQUIPDSCMML_PRECISION_F', + SNAME => 'NEQUIPDSCMML_PRECISION', SCAPTION => 'Точность', SDATA_TYPE => PKG_P8PANELS_VISUAL.SDATA_TYPE_NUMB); PKG_P8PANELS_VISUAL.TDG_ADD_COL_DEF(RDATA_GRID => RDG, @@ -1532,7 +1532,7 @@ create or replace package body UDO_PKG_EQUIPDS as TO_CHAR(T.RQ_DATE, 'dd.mm.yyyy hh24:mi:ss') SRQ_DATE, DS.CODE SEQUIPDS_CODE, ML.TASK SEQUIPDSCMML_TASK, - ML.PRECISION_F NEQUIPDSCMML_PRECISION_F, + ML.PRECISION NEQUIPDSCMML_PRECISION, DM.MEAS_MNEMO SDICMUNTS, T.FORECAST BFORECAST, null NFORECAST, @@ -1571,8 +1571,8 @@ create or replace package body UDO_PKG_EQUIPDS as PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SEQUIPDS_CODE', SVALUE => C.SEQUIPDS_CODE); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'SEQUIPDSCMML_TASK', SVALUE => C.SEQUIPDSCMML_TASK); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, - SNAME => 'NEQUIPDSCMML_PRECISION_F', - NVALUE => C.NEQUIPDSCMML_PRECISION_F); + SNAME => 'NEQUIPDSCMML_PRECISION', + NVALUE => C.NEQUIPDSCMML_PRECISION); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'STO_FORECAST_DESC', SVALUE => C.STO_FORECAST_DESC); PKG_P8PANELS_VISUAL.TDG_ROW_ADD_COL(RROW => RDG_ROW, SNAME => 'STO_FORECAST_DESC_COLOR', diff --git a/db/UDO_PKG_EQUIPDS_BASE.pck b/db/UDO_PKG_EQUIPDS_BASE.pck index 80e75ec..bf0cfd2 100644 --- a/db/UDO_PKG_EQUIPDS_BASE.pck +++ b/db/UDO_PKG_EQUIPDS_BASE.pck @@ -249,11 +249,11 @@ create or replace package UDO_PKG_EQUIPDS_BASE as NRN in number -- Регистрационный номер ); - /* Базовая установка фактической точности "Выборки данных оборудования (классы оборудования, модели)" */ - procedure CMML_SET_PRECISION_F + /* Базовая установка точности "Выборки данных оборудования (классы оборудования, модели)" */ + procedure CMML_SET_PRECISION ( NRN in number, -- Регистрационный номер - NPRECISION_F in number -- Точность (факт) + NPRECISION in number -- Точность ); /* Базовая установка состояния "Выборки данных оборудования (классы оборудования, модели)" */ @@ -1044,7 +1044,7 @@ create or replace package body UDO_PKG_EQUIPDS_BASE as NRN := GEN_ID(); /* Добавляем запись */ insert into UDO_T_EQUIPDSCMML - (RN, PRN, TASK, PRECISION_F, QUEUE_ID, STATUS, ERR, DATASET_ID) + (RN, PRN, TASK, PRECISION, QUEUE_ID, STATUS, ERR, DATASET_ID) values (NRN, NPRN, STASK, null, null, NCMML_STATUS_REGISTERED, null, NDATASET_ID); end CMML_INS; @@ -1092,17 +1092,17 @@ create or replace package body UDO_PKG_EQUIPDS_BASE as delete from UDO_T_EQUIPDSCMML T where T.RN = NRN; end CMML_DEL; - /* Базовая установка фактической точности "Выборки данных оборудования (классы оборудования, модели)" */ - procedure CMML_SET_PRECISION_F + /* Базовая установка точности "Выборки данных оборудования (классы оборудования, модели)" */ + procedure CMML_SET_PRECISION ( NRN in number, -- Регистрационный номер - NPRECISION_F in number -- Точность (факт) + NPRECISION in number -- Точность ) is begin - /* Установим фактическую точность */ - update UDO_T_EQUIPDSCMML T set T.PRECISION_F = NPRECISION_F where T.RN = NRN; - end CMML_SET_PRECISION_F; + /* Установим точность */ + update UDO_T_EQUIPDSCMML T set T.PRECISION = NPRECISION where T.RN = NRN; + end CMML_SET_PRECISION; /* Базовая установка состояния "Выборки данных оборудования (классы оборудования, модели)" */ procedure CMML_SET_STATUS diff --git a/db/UDO_T_EQUIPDSCMML.sql b/db/UDO_T_EQUIPDSCMML.sql index 3a5f7d6..ac1ba14 100644 --- a/db/UDO_T_EQUIPDSCMML.sql +++ b/db/UDO_T_EQUIPDSCMML.sql @@ -7,10 +7,8 @@ create table UDO_T_EQUIPDSCMML PRN number(17) not null, /* Задача (TCF - оценка технического состояния (Technical Condition Forecast), RUL - прогнозирование остаточного ресурса (Remaining Useful Life), FP - Прогнозирование отказа (Failure Predict)) */ TASK varchar2(3) default 'RUL' not null, - /* Точность (план) - не используется */ - PRECISION_P number(3) default 100 not null, - /* Точность (факт) */ - PRECISION_F number(17,2) default null, + /* Точность */ + PRECISION number(17,2) default null, /* Идентификатор очереди обработки */ QUEUE_ID varchar2(200) default null, /* Состояние (0 - зарегистрирована, 1 - обрабатывается внешней системой, 2 - успешно обработана внешней системой, 3 - при обработке внешней системой произошла ошибка) */ @@ -24,8 +22,7 @@ create table UDO_T_EQUIPDSCMML constraint UDO_C_EQUIPDSCMML_PRN_FK foreign key (PRN) references UDO_T_EQUIPDSCM(RN), constraint UDO_C_EQUIPDSCMML_TASK_NB check (rtrim(TASK) is not null), constraint UDO_C_EQUIPDSCMML_TASK_CH check (TASK in ('TCF', 'RUL', 'FP')), - constraint UDO_C_EQUIPDSCMML_PRECP_CH check ((PRECISION_P > 0) and (PRECISION_P <= 100)), - constraint UDO_C_EQUIPDSCMML_PRECF_CH check ((PRECISION_F is null) or ((PRECISION_F is not null) and (PRECISION_F >= 0))), + constraint UDO_C_EQUIPDSCMML_PREC_CH check ((PRECISION is null) or ((PRECISION is not null) and (PRECISION >= 0))), constraint UDO_C_EQUIPDSCMML_QID_NB check ((QUEUE_ID is null) or (rtrim(QUEUE_ID) is not null)), constraint UDO_C_EQUIPDSCMML_QID_CH check (((STATUS in (1, 2)) and (QUEUE_ID is not null)) or ((STATUS not in (1, 2)) and (QUEUE_ID is null))), constraint UDO_C_EQUIPDSCMML_STATUS_CH check (STATUS in (0, 1, 2, 3)), diff --git a/panels/eqs_tech_cond_forecast/admin_tab_layout.js b/panels/eqs_tech_cond_forecast/admin_tab_layout.js index 0704fce..7323af4 100644 --- a/panels/eqs_tech_cond_forecast/admin_tab_layout.js +++ b/panels/eqs_tech_cond_forecast/admin_tab_layout.js @@ -170,9 +170,9 @@ const filesListDataCellRender = ({ row, columnDef, theme, onDelete }) => { //Форматирование колонок таблицы моделей класса оборудования выборки данных const modelsListDataCellRender = ({ row, columnDef, theme, onDelete, onSendRq }) => { switch (columnDef.name) { - case "NPRECISION_F": + case "NPRECISION": return { - data: row.NSTATUS == 2 ? `${row.NPRECISION_F} ${row.SDICMUNTS}` : "" + data: row.NSTATUS == 2 ? `${row.NPRECISION} ${row.SDICMUNTS}` : "" }; case "NSTATUS": return { diff --git a/panels/eqs_tech_cond_forecast/forecast_tab_layout.js b/panels/eqs_tech_cond_forecast/forecast_tab_layout.js index dc8748d..b63d9ad 100644 --- a/panels/eqs_tech_cond_forecast/forecast_tab_layout.js +++ b/panels/eqs_tech_cond_forecast/forecast_tab_layout.js @@ -74,11 +74,11 @@ const techObjCardModelsTableDataCellRender = ({ row, columnDef, theme, onGoToMod switch (columnDef.name) { case "SNEQUIPDS": case "STASK": - case "NPRECISION_F": + case "NPRECISION": return { data: ( onGoToModel(row)}> - {`${row[columnDef.name]}${columnDef.name == "NPRECISION_F" && row.NSTATUS == 2 ? ` ${row.SDICMUNTS}` : ""}`} + {`${row[columnDef.name]}${columnDef.name == "NPRECISION" && row.NSTATUS == 2 ? ` ${row.SDICMUNTS}` : ""}`} ) }; @@ -113,8 +113,8 @@ const techObjCardForecastListTableHeadCellRender = ({ columnDef }) => { //Форматирование колонок таблицы истории прогнозов класса оборудования выборки данных const techObjCardForecastListTableDataCellRender = ({ row, columnDef, onShowForecastDetail }) => { switch (columnDef.name) { - case "NEQUIPDSCMML_PRECISION_F": - return { data: `${row.NEQUIPDSCMML_PRECISION_F} ${row.SDICMUNTS}` }; + case "NEQUIPDSCMML_PRECISION": + return { data: `${row.NEQUIPDSCMML_PRECISION} ${row.SDICMUNTS}` }; case "STO_FORECAST_DESC": return { cellProps: { align: "right" },