Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
9d6e9d5e
by tchemit at 2019-04-15T16:30:07Z
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:
| ... | ... | @@ -48,15 +48,13 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { |
| 48 | 48 |
|
| 49 | 49 |
private static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE);
|
| 50 | 50 |
|
| 51 |
- private static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15");
|
|
| 52 |
- |
|
| 53 | 51 |
private static final List<String> SYSTEM_OPERATIONS = Arrays.asList("0", "11", "11", ACTIVITY_FIN_DE_VEILLE);
|
| 54 | 52 |
|
| 55 | 53 |
private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation";
|
| 56 | 54 |
|
| 57 | 55 |
@Override
|
| 58 | 56 |
public boolean isDCPOperation() {
|
| 59 |
- return vesselActivitySeine != null && DCP_OPERATIONS.contains(vesselActivitySeine.getCode());
|
|
| 57 |
+ return vesselActivitySeine != null && vesselActivitySeine.isAllowFad();
|
|
| 60 | 58 |
}
|
| 61 | 59 |
|
| 62 | 60 |
@Override
|
| ... | ... | @@ -163,6 +161,4 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { |
| 163 | 161 |
.toString();
|
| 164 | 162 |
}
|
| 165 | 163 |
|
| 166 |
-}
|
|
| 167 |
- |
|
| 168 |
- |
|
| 164 |
+}
|
|
| \ No newline at end of file |
| ... | ... | @@ -225,9 +225,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 225 | 225 |
|
| 226 | 226 |
String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax);
|
| 227 | 227 |
|
| 228 |
+ boolean floatingObjectNotEmpty = activitySeine.isFloatingObjectNotEmpty();
|
|
| 228 | 229 |
if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) {
|
| 229 |
- log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
|
|
| 230 |
- continue;
|
|
| 230 |
+ if (floatingObjectNotEmpty) {
|
|
| 231 |
+ 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()));
|
|
| 232 |
+ } else {
|
|
| 233 |
+ log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
|
|
| 234 |
+ continue;
|
|
| 235 |
+ }
|
|
| 231 | 236 |
}
|
| 232 | 237 |
|
| 233 | 238 |
ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine));
|