Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9d6e9d5e by tchemit at 2019-04-15T16:30:07Z [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable ne se fait pas en passant l'algorithme de calcul - Closes #1268 - - - - - 2 changed files: - persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java ===================================== @@ -48,15 +48,13 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { private static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE); - private static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15"); - private static final List<String> SYSTEM_OPERATIONS = Arrays.asList("0", "11", "11", ACTIVITY_FIN_DE_VEILLE); private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; @Override public boolean isDCPOperation() { - return vesselActivitySeine != null && DCP_OPERATIONS.contains(vesselActivitySeine.getCode()); + return vesselActivitySeine != null && vesselActivitySeine.isAllowFad(); } @Override @@ -163,6 +161,4 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { .toString(); } -} - - +} \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -225,9 +225,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + boolean floatingObjectNotEmpty = activitySeine.isFloatingObjectNotEmpty(); if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); - continue; + if (floatingObjectNotEmpty) { + log.warn(String.format("%s Use activity with some FOB but his activity does not allow FAD (vessel activity code: %s) : %s", activityPrefix, activitySeine.getVesselActivitySeine().getCode(), activitySeine.getTopiaId())); + } else { + log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); + continue; + } } ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d6e9d5ec129ee0285262de37faf... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d6e9d5ec129ee0285262de37faf... You're receiving this email because of your account on gitlab.com.