Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7c66455f by Tony Chemit at 2023-01-25T09:36:04+01:00 Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615 - - - - - 02e11b30 by Tony Chemit at 2023-01-25T09:36:34+01:00 Avdth - Review some Floating Object mappings (sort them and re-add some removed ones...) - See #2612 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -76,19 +76,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("0", "99") .put("1", "99") .put("2", "99") - .put("3", "99") - .put("4", "99") - .put("10", "99") - .put("14", "99") + + .put("3", "2") + .put("4", "2") + .put("5", "1") + .put("6", "4") + .put("7", "99") .put("8", "99") .put("9", "99") + .put("10", "99") .put("12", "99") .put("13", "99") + .put("14", "99") .put("15", "99") - .put("5", "1") - .put("6", "4") .put("22", "4") .put("23", "1") .put("24", "4") @@ -110,8 +112,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create. */ public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("3", "1") // Visite | Visite + .put("4", "1") // Visite | Visite .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau .put("6", "2") // Retrait | null ou 2 Récupération + .put("7", "1") // Visite | Visite + .put("10", "1")// Visite | Visite + .put("12", "1")// Visite | Visite + .put("13", "1")// Visite | Visite + .put("14", "1")// Visite | Visite + .put("15", "1")// Visite | Visite .put("23", "3") // Mise à l'eau | 3 Mise à l'eau .put("24", "2") // Retrait | 2 Récupération .put("25", "3") // Visite | 3 Mise à l'eau @@ -137,15 +147,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { "2", "3", "4", + "6", + "7", + "8", "9", "10", "12", + "13", "14", "15", - "7", - "8", - "13", - "6", "22", "24", "25", ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; import fr.ird.observe.entities.data.ps.localmarket.Batch; @@ -178,9 +177,8 @@ public class TripConsolidateEngine { String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty(); - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) { - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId())); + if (activity.getSetSize() == 0) { + log.info(String.format("%s Skip activity (No set found): %s", activityPrefix, activity.getTopiaId())); continue; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe1373e03bd6db2515f690b55... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe1373e03bd6db2515f690b55... You're receiving this email because of your account on gitlab.com.