diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java index c818196158..c66b9881db 100644 --- a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java +++ b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java @@ -483,7 +483,7 @@ public class UtilityDB { List> queryResults = executeSimpleQuery(conn, querySql); - if (queryResults.size() > 0) { + if (!queryResults.isEmpty()) { object = queryResults.get(0); } diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java index 61f509cf53..cf856a2128 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeColliImportService.java @@ -23,6 +23,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; import java.util.HashMap; @@ -120,9 +121,15 @@ public class ExchangeColliImportService { AtomicInteger dataCount = new AtomicInteger(0); AtomicInteger importedCounter = new AtomicInteger(0); - LocalDate startDate = LocalDate.of(2024, 7, 1); + String sqlMinDate = "SELECT MIN(data_collo) FROM " + testataTableName + (useTempTable ? "_tmp" : ""); + Timestamp startDateTimeStamp = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(exchangeMultiDb.getPrimaryConnection(), sqlMinDate); + + LocalDate startDate = startDateTimeStamp.toLocalDateTime().toLocalDate(); +// LocalDate startDate = LocalDate.of(2024, 7, 1); Result firstErrorObjectIfPresent = null; + + while (startDate.minusDays(1).isBefore(UtilityLocalDate.getNow())) { final LocalDate tempStartDate = startDate;