Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
b135087c
by tchemit at 2019-04-15T16:33:02Z
3 changed files:
- persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java
- persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeines.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
Changes:
| ... | ... | @@ -39,7 +39,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { |
| 39 | 39 |
|
| 40 | 40 |
@Override
|
| 41 | 41 |
public boolean isDCPOperation() {
|
| 42 |
- return vesselActivitySeine != null && ActivitySeines.DCP_OPERATIONS.contains(vesselActivitySeine.getCode());
|
|
| 42 |
+ return vesselActivitySeine != null && vesselActivitySeine.isAllowFad();
|
|
| 43 | 43 |
}
|
| 44 | 44 |
|
| 45 | 45 |
@Override
|
| ... | ... | @@ -57,8 +57,6 @@ public class ActivitySeines { |
| 57 | 57 |
public static final String ACTIVITY_FIN_DE_PECHE = "6";
|
| 58 | 58 |
public static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE);
|
| 59 | 59 |
public static final String ACTIVITY_CHANGED_ZONE = "21";
|
| 60 |
- public static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15");
|
|
| 61 |
- |
|
| 62 | 60 |
|
| 63 | 61 |
/** Logger. */
|
| 64 | 62 |
private static final Logger log = LogManager.getLogger(ActivitySeines.class);
|
| ... | ... | @@ -227,9 +227,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 227 | 227 |
|
| 228 | 228 |
String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax);
|
| 229 | 229 |
|
| 230 |
+ boolean floatingObjectNotEmpty = activitySeine.isFloatingObjectNotEmpty();
|
|
| 230 | 231 |
if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) {
|
| 231 |
- log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
|
|
| 232 |
- continue;
|
|
| 232 |
+ if (floatingObjectNotEmpty) {
|
|
| 233 |
+ 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()));
|
|
| 234 |
+ } else {
|
|
| 235 |
+ log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
|
|
| 236 |
+ continue;
|
|
| 237 |
+ }
|
|
| 233 | 238 |
}
|
| 234 | 239 |
|
| 235 | 240 |
ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine));
|