diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 3e4163572..5fd93f86d 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -49,6 +49,15 @@ + + + src/main/resources + + application.properties + + false + + org.springframework.boot diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExporterConfig.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExporterConfig.java index 811c2733d..ba9acb1ef 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExporterConfig.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExporterConfig.java @@ -48,7 +48,7 @@ public class DBFExporterConfig { params.setClusterMembers(properties.getHazelcastClusterMembers()); params.setLogin(properties.getHazelcastLogin()); params.setPassword(properties.getHazelcastPassword()); - params.setInstanceName("dbf-exporter"); +// params.setInstanceName("dbf-exporter"); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } diff --git a/clearing-parent/dbf-exporter/src/main/resources/logback.xml b/clearing-parent/dbf-exporter/src/main/resources/logback.xml index f69e3db9a..3fa1dc6e8 100644 --- a/clearing-parent/dbf-exporter/src/main/resources/logback.xml +++ b/clearing-parent/dbf-exporter/src/main/resources/logback.xml @@ -8,14 +8,14 @@ - ./logs/dbf_exporter.log + ./logs/dbf-exporter.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - ../logs/dbf_export.%i.log + ../logs/dbf-export.%i.log 1 10 diff --git a/clearing-parent/dbf-importer/src/main/resources/logback.xml b/clearing-parent/dbf-importer/src/main/resources/logback.xml index 902144168..0d5d9d875 100644 --- a/clearing-parent/dbf-importer/src/main/resources/logback.xml +++ b/clearing-parent/dbf-importer/src/main/resources/logback.xml @@ -8,14 +8,14 @@ - ./logs/dbf_importer.log + ./logs/dbf-importer.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - ../logs/dbf_loader.%i.log + ../logs/dbf-importer.%i.log 1 10 diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java index d2f079e89..50a6a8f60 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java @@ -8,14 +8,11 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SqlTypeValue; import org.springframework.jdbc.core.StatementCreatorUtils; import org.springframework.lang.NonNull; -import ru.spcex.clearing.imdg.utils.BigDecimalUtil; import ru.spcex.platform.classes.base.SpcexObjectBase; -import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.sql.Types; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.*; @@ -147,30 +144,7 @@ public abstract class SimpleObjectMapStore implements try { int[][] ret = jdbcTemplate.batchUpdate(insertStatement, args, bathSize, (ps, params) -> { for (int i = 0; i < params.length; i++) { - int type = ps.getParameterMetaData().getParameterType(i + 1); Object value = params[i]; - if (value != null) { - if ((type == Types.VARCHAR || type == Types.CHAR) && value instanceof String) { - String stringValue = (String) value; - int length = ps.getParameterMetaData().getPrecision(i + 1); - if (stringValue.length() > length) { - value = stringValue.substring(0, length); - log.error("String value for insert is too large [ insertSql: {}, params: {}, incorrect value : {}, normalized value: {} ]", - insertStatement, Arrays.toString(params), stringValue, value); - } - } else if ((type == Types.DECIMAL || type == Types.NUMERIC) && value instanceof BigDecimal) { - BigDecimal bigDecimalValue = (BigDecimal) value; - int dbScalePartLength = ps.getParameterMetaData().getScale(i + 1); - int precision = ps.getParameterMetaData().getPrecision(i + 1); - if (!BigDecimalUtil.checkSize(bigDecimalValue, precision, dbScalePartLength)) { - value = BigDecimalUtil.genMaxValueForInsert(precision, dbScalePartLength); - log.error("BigDecimal value for insert is too large [ insertSql: {}, params: {}, incorrect value : {}, normalized value: {} ]", - insertStatement, Arrays.toString(params), bigDecimalValue, value); - } - } - } - //в batchUpdate(String sql, List batchArgs), как типа поля всегда передавался SqlTypeValue.TYPE_UNKNOWN, - //см. BatchUpdateUtils.setStatementParameters try { StatementCreatorUtils.setParameterValue(ps, i + 1, SqlTypeValue.TYPE_UNKNOWN, value); } catch (SQLException e) {