From 45e163d1b7625ab5626f5a201fc3bc710c64e263 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 22 Nov 2022 12:06:45 +0300 Subject: [PATCH] meta update --- .../src/main/resources/meta/meta.server.xslt | 5 +- .../src/main/resources/meta/meta.xml | 152 +++++++++--------- .../balance/service/Sdf09Executor.java | 2 +- .../classes/statics/data/sdf/SDf10.java | 10 +- .../clearing/imdg/object/SDf10MapStore.java | 4 +- 5 files changed, 86 insertions(+), 87 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt b/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt index 7897340ca..78e8d929d 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt @@ -89,13 +89,12 @@ , - {"": - { + {"method":"", "": "", "fields": [] - }} + } diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 7bc706510..234da06e6 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -244,8 +244,8 @@ - - + + @@ -276,8 +276,8 @@ - - + + @@ -290,8 +290,8 @@ - - + + @@ -314,8 +314,8 @@ - - + + @@ -338,8 +338,8 @@ - - + + @@ -382,8 +382,8 @@ - - + + @@ -399,8 +399,8 @@ - - + + @@ -524,8 +524,8 @@ - - + + @@ -590,18 +590,18 @@ - - + + - + - - + + @@ -672,8 +672,8 @@ - - + + @@ -728,8 +728,8 @@ - - + + @@ -740,8 +740,8 @@ - - + + @@ -752,8 +752,8 @@ - - + + @@ -775,8 +775,8 @@ - - + + @@ -803,8 +803,8 @@ - - + + @@ -985,8 +985,8 @@ - - + + @@ -1000,8 +1000,8 @@ - - + + @@ -1019,8 +1019,8 @@ - - + + @@ -1049,8 +1049,8 @@ - - + + @@ -1071,8 +1071,8 @@ - - + + @@ -1085,16 +1085,16 @@ - - + + - - + + @@ -1104,18 +1104,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -1147,8 +1147,8 @@ - - + + @@ -1160,8 +1160,8 @@ - - + + @@ -1174,14 +1174,14 @@ - - + + - - + + @@ -1323,7 +1323,7 @@ - + @@ -1350,7 +1350,7 @@ - + @@ -1483,9 +1483,9 @@ - - - + + + @@ -1540,8 +1540,8 @@ - - + + @@ -1557,8 +1557,8 @@ - - + + diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java index b7dd35790..4c532ee05 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java @@ -161,7 +161,7 @@ public class Sdf09Executor extends AbstractExecutor { sDf10.setResult("OK"); sDf10.setGenerationId(generationIdForGroup); sDf10.setGenerationTime(Instant.now()); - sDf10.setIn_s_df09_id(sdf09.getId()); + sDf10.setInSDf09Id(sdf09.getId()); return sDf10; } } 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 590b5c0f8..8ebf871ba 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 @@ -24,7 +24,7 @@ public class SDf10 extends SpcexObjectBase implements WithAccount { private String result; private Instant generationTime; private Long generationId; - private Long in_s_df09_id; + private Long inSDf09Id; @Override public String getAccount() { @@ -99,11 +99,11 @@ public class SDf10 extends SpcexObjectBase implements WithAccount { this.generationId = generationId; } - public Long getIn_s_df09_id() { - return in_s_df09_id; + public Long getInSDf09Id() { + return inSDf09Id; } - public void setIn_s_df09_id(Long in_s_df09_id) { - this.in_s_df09_id = in_s_df09_id; + public void setInSDf09Id(Long inSDf09Id) { + this.inSDf09Id = inSDf09Id; } } 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 bb0ef14bd..98120f165 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 @@ -49,7 +49,7 @@ public class SDf10MapStore extends TemplateMapStore { object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setIn_s_df09_id(resultSet.getObject("IN_S_DF09_ID", Long.class)); + object.setInSDf09Id(resultSet.getObject("IN_S_DF09_ID", Long.class)); return object; } @@ -66,7 +66,7 @@ public class SDf10MapStore extends TemplateMapStore { object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getIn_s_df09_id() + object.getInSDf09Id() }; return args; }