diff --git a/src/main/java/com/example/services/StoreService.java b/src/main/java/com/example/services/StoreService.java index 2ad33eb..fa12d4e 100644 --- a/src/main/java/com/example/services/StoreService.java +++ b/src/main/java/com/example/services/StoreService.java @@ -129,7 +129,7 @@ public class StoreService { "FROM COM02.STRUCTURE st " + "LEFT OUTER JOIN omni.ASPD_XSTO_STRUCTURE axs ON st.ID_STRUCTURE = axs.ID_STRUCTURE " + "JOIN COM02.hotline_structure_caisse hsc ON hsc.id_structure = st.id_structure AND hsc.id_caisse = 1 " + - "WHERE st.id_structure < 50 AND hsc.ip IS NOT NULL AND st.ID_NIVEAU=4 AND st.STATUT=2 " + + "WHERE st.id_structure < 9999 AND hsc.ip IS NOT NULL AND st.ID_NIVEAU=4 AND st.STATUT=2 " + "ORDER BY st.id_structure"; try (PreparedStatement statement = databaseConnection.getConnection().prepareStatement(query); @@ -246,7 +246,7 @@ public class StoreService { " CASE WHEN TRUNC(MAX(cf.fdate)) = TRUNC(SYSDATE )THEN 1 ELSE 0 END AS backOfficeTransactionOk "+ "FROM com02.client_facture cf " + "WHERE cf.id_structure = ? " + - "AND TRUNC(cf.fdate_integration) = TRUNC(SYSDATE-2) " + //TODO : changer la date + "AND TRUNC(cf.fdate_integration) = TRUNC(SYSDATE) " + //TODO : changer la date "AND cf.version_info = 'XSTORE'"; logger.info(transactionQuery); diff --git a/src/main/java/com/example/services/store/StoreReplication.java b/src/main/java/com/example/services/store/StoreReplication.java index 4b588b2..3491ae2 100644 --- a/src/main/java/com/example/services/store/StoreReplication.java +++ b/src/main/java/com/example/services/store/StoreReplication.java @@ -18,7 +18,7 @@ public class StoreReplication { public StoreReplication(boolean pendingReplicationOk, int pendingReplications, Date minPendingReplicationDate, Date maxPendingReplicationDate) { this.pendingReplicationOk = pendingReplicationOk; this.pendingReplications = pendingReplications; - this.minPendingReplicationDate = maxPendingReplicationDate; + this.minPendingReplicationDate = minPendingReplicationDate; this.maxPendingReplicationDate = maxPendingReplicationDate; } diff --git a/src/main/resources/db.properties b/src/main/resources/db.properties index 34ea8ca..1c8d3b9 100644 --- a/src/main/resources/db.properties +++ b/src/main/resources/db.properties @@ -9,7 +9,7 @@ preprod.db.oai.password=base preprod.db.com02.password=B1Xto9pAbtBCOxuecG7W # Production environment settings (prod) -prod.db.url=jdbc:oracle:thin:@paspdi-mgmt.adic.lan.adic.lan:1521/IASPDI +prod.db.url=jdbc:oracle:thin:@v-aspd-b03-ip-d.adic.lan:1521/PASPDI prod.db.oai.password=base prod.db.com02.password=com20 diff --git a/src/main/resources/env.properties b/src/main/resources/env.properties index 40b8a7c..e30e658 100644 --- a/src/main/resources/env.properties +++ b/src/main/resources/env.properties @@ -1,2 +1,2 @@ # Indicates the current environment (dev, preprod, prod, etc.). -environment=preprod \ No newline at end of file +environment=prod \ No newline at end of file