Migliorato controllo di abilitazione dei contratti di acquisto/vendita

ems-core/src/main/java/it/integry/ems/service/production/MrpConsumiHandlerService.java

@@ -40,7 +40,7 @@ public class MrpConsumiHandlerService {
 
 
     @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.MINUTES, initialDelay = 60, zone = "Europe/Rome")
-    private void updateData() throws Exception {
+    private void updateData() {
         final List<AvailableConnectionsModel> availableConnections = settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true);
 
         for (AvailableConnectionsModel connectionModel : availableConnections) {

ems-engine/src/main/java/it/integry/ems/product/service/ContrattiDiAcquistoHandlerService.java

@@ -13,6 +13,7 @@ import it.integry.ems_model.entity.AtbOffr;
 import it.integry.ems_model.entity.AtbOfft;
 import it.integry.ems_model.types.OperationType;
 import it.integry.ems_model.utility.UtilityDB;
+import it.integry.ems_model.utility.UtilityTiming;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -71,21 +71,20 @@ public class ContrattiDiAcquistoHandlerService {
     }
 
     @Scheduled(fixedDelay = 10, timeUnit = TimeUnit.SECONDS, initialDelay = 60, zone = "Europe/Rome")
-    private void updateProgContrattoA() throws Exception {
+    private void updateProgContrattoA() {
         if (!canBeExecuted) return;
 
         final List<AvailableConnectionsModel> availableConnections = settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true);
 
         for (AvailableConnectionsModel connectionModel : availableConnections) {
+            boolean isEnabled = executionPermission.getOrDefault(connectionModel.getDbName(), false);
+            if (!isEnabled) continue;
+
             try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connectionModel, false)) {
 
-                boolean isEnabled = executionPermission.getOrDefault(connectionModel.getDbName(), false);
+                final int timingId = UtilityTiming.startNewTiming(getClass().getSimpleName());
-                Date startDate = new Date();
-
-                if (isEnabled)
                 updateProgressivi(multiDBTransactionManager);
-
+                UtilityTiming.endTiming(timingId, true);
-                logger.trace(ContrattiDiAcquistoHandlerService.class.getSimpleName() + ": Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
 
             } catch (Exception ex) {
                 logger.error(ex.getMessage(), ex);

ems-engine/src/main/java/it/integry/ems/product/service/ContrattiDiVenditaHandlerService.java

@@ -13,6 +13,7 @@ import it.integry.ems_model.entity.VtbOffr;
 import it.integry.ems_model.entity.VtbOfft;
 import it.integry.ems_model.types.OperationType;
 import it.integry.ems_model.utility.UtilityDB;
+import it.integry.ems_model.utility.UtilityTiming;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -76,15 +76,14 @@ public class ContrattiDiVenditaHandlerService {
         final List<AvailableConnectionsModel> availableConnections = settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(true);
 
         for (AvailableConnectionsModel connectionModel : availableConnections) {
+            boolean isEnabled = executionPermission.getOrDefault(connectionModel.getDbName(), false);
+            if (!isEnabled) continue;
+
             try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connectionModel, false)) {
 
-                boolean isEnabled = executionPermission.getOrDefault(connectionModel.getDbName(), false);
+                final int timingId = UtilityTiming.startNewTiming(getClass().getSimpleName());
-                Date startDate = new Date();
-
-                if (isEnabled)
                 updateProgressivi(multiDBTransactionManager);
-
+                UtilityTiming.endTiming(timingId, true);
-                logger.trace(ContrattiDiAcquistoHandlerService.class.getSimpleName() + ": Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
 
             } catch (Exception ex) {
                 logger.error(ex.getMessage(), ex);

ems-engine/src/main/java/it/integry/ems/retail/service/GrigliaAcquistoHandlerService.java

@@ -111,8 +111,6 @@ public class GrigliaAcquistoHandlerService {
 
             try (MultiDBTransactionManager multiDBTransactionManager = new MultiDBTransactionManager(connectionModel, false)) {
 
-                if (isGestioneAbilitata(connectionModel.getDbName())) {
-
                 HashMap<String, Object> checkDbDistributore = checkDbDistributore(multiDBTransactionManager);
                 boolean existSync = (boolean) checkDbDistributore.get("existSync");
 
@@ -126,7 +124,6 @@ public class GrigliaAcquistoHandlerService {
 
                     UtilityTiming.endTiming(timingId, true);
                 }
-                }
 
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);