From 92e59b99cf6bfbaf2ea9fe907abbf742fd03a392 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 30 Jun 2026 15:29:28 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1057 --- .../ru/clearing/classes/ConstSerializable.java | 2 +- .../clearing/classes/statics/data/sdf/SDf10.java | 9 +++++++++ .../db-scripts/src/main/resources/db/DDL.sql | 8 +++++--- .../src/main/resources/db/updateDDL_3.27.sql | 6 ++++++ .../spcex/clearing/imdg/object/SDf10MapStore.java | 15 ++++++++------- .../imdg/services/HazelcastLifecycleSupport.java | 2 +- 6 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.27.sql diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java index bf2aa747d..3a0fed7e2 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java @@ -4,5 +4,5 @@ package ru.clearing.classes; * В случае любых изменений модуля classes необходимо изменить serialVersionUID++ */ public interface ConstSerializable { - long serialVersionUID = 293236453422L; + long serialVersionUID = 293236453423L; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java index 9b0c91f5e..58bababed 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java @@ -22,6 +22,7 @@ public class SDf10 extends SpcexObjectBase implements WithMessageId, WithParentI private Long generationId; private String messageId; private String parentId; + private String workflowStatus; public String getOutDocument() { return outDocument; @@ -87,6 +88,14 @@ public class SDf10 extends SpcexObjectBase implements WithMessageId, WithParentI this.generationId = generationId; } + public String getWorkflowStatus() { + return workflowStatus; + } + + public void setWorkflowStatus(String workflowStatus) { + this.workflowStatus = workflowStatus; + } + @Override public String getMessageId() { return messageId; diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 871f9aaa4..812b64340 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.23 +-- DB version: 3.27 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -4407,7 +4407,7 @@ GRANT ALL PRIVILEGES ON TABLE S_DF09 TO clearing; -- sDf10 - ДФ-10 Запрос на зачисление/списание ценных бумаг DROP TABLE IF EXISTS S_DF10; -CREATE TABLE S_DF10(ID bigint PRIMARY KEY, OUT_DOCUMENT varchar, DEPO_CODE varchar, QUANTITY varchar, SECURITY_CODE varchar, CLIENT_NAME varchar, FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, MESSAGE_ID varchar(128), PARENT_ID varchar(128)); +CREATE TABLE S_DF10(ID bigint PRIMARY KEY, OUT_DOCUMENT varchar, DEPO_CODE varchar, QUANTITY varchar, SECURITY_CODE varchar, CLIENT_NAME varchar, FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint, MESSAGE_ID varchar(128), PARENT_ID varchar(128), WORKFLOW_STATUS varchar(4)); COMMENT ON TABLE S_DF10 IS 'ДФ-10 Запрос на зачисление/списание ценных бумаг'; COMMENT ON COLUMN S_DF10.ID IS 'Идентификатор записи'; @@ -4432,6 +4432,8 @@ COMMENT ON COLUMN S_DF10.MESSAGE_ID IS 'Номер документа'; COMMENT ON COLUMN S_DF10.PARENT_ID IS 'Номер родительского документа'; +COMMENT ON COLUMN S_DF10.WORKFLOW_STATUS IS 'Код статуса (linked to workflowStatus)'; + GRANT ALL PRIVILEGES ON TABLE S_DF10 TO clearing; -- sDf11 - ДФ-11 Ответ на Запрос на зачисление/списание ценных бумаг @@ -5852,4 +5854,4 @@ GRANT ALL PRIVILEGES ON TABLE ORDER_CURRENCY_HISTORY TO clearing; -- Data types -INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.26') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.27') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION \ No newline at end of file diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.27.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.27.sql new file mode 100644 index 000000000..27ae1119b --- /dev/null +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.27.sql @@ -0,0 +1,6 @@ +-- DB version: 3.26 -> 3.27 + +ALTER TABLE S_DF10 ADD COLUMN IF NOT EXISTS WORKFLOW_STATUS VARCHAR(4); +COMMENT ON COLUMN S_DF10.WORKFLOW_STATUS IS 'Код статуса (linked to workflowStatus)'; + +INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.27') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION; \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java index 92263aa8b..6cf8eabd0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java @@ -1,5 +1,9 @@ package ru.spcex.clearing.imdg.object; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.time.LocalDate; +import java.util.List; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.sdf.SDf10; @@ -8,11 +12,6 @@ import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.log.ExceptionUtils; import ru.spcex.platform.utils.time.TimeUtil; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.time.LocalDate; -import java.util.List; - @Component public class SDf10MapStore extends TemplateMapStore { @@ -34,7 +33,7 @@ public class SDf10MapStore extends TemplateMapStore { public String[] getFields() { return new String[]{ "ID", "OUT_DOCUMENT", "DEPO_CODE", "QUANTITY", "SECURITY_CODE", "CLIENT_NAME", "FILE_NAME", - "GENERATION_TIME", "GENERATION_ID", "MESSAGE_ID", "PARENT_ID" + "GENERATION_TIME", "GENERATION_ID", "MESSAGE_ID", "PARENT_ID", "WORKFLOW_STATUS" }; } @@ -67,6 +66,7 @@ public class SDf10MapStore extends TemplateMapStore { object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setMessageId(resultSet.getObject("MESSAGE_ID", String.class)); object.setParentId(resultSet.getObject("PARENT_ID", String.class)); + object.setWorkflowStatus(resultSet.getObject("WORKFLOW_STATUS", String.class)); return object; } @@ -83,7 +83,8 @@ public class SDf10MapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), object.getMessageId(), - object.getParentId() + object.getParentId(), + object.getWorkflowStatus() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java index 8c6994875..65d8068b7 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java @@ -14,7 +14,7 @@ public class HazelcastLifecycleSupport extends AbstractHazelcastLifecycleSupport /** * Рабочая версия БД. Требуется вручную сверять с DDL.sql и накручивать эту переменную. */ - public static final String CHECK_DB_VERSION = "3.22"; + public static final String CHECK_DB_VERSION = "3.27"; private final Logger log = LoggerFactory.getLogger(this.getClass());